[commit: ghc] wip/pretty32: Experimental fix for pretty:32 (d21262e)

git at git.haskell.org git at git.haskell.org
Sat Feb 6 09:36:06 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/pretty32
Link       : http://ghc.haskell.org/trac/ghc/changeset/d21262e73caa1dcade72790f6639c9e56ffd8211/ghc

>---------------------------------------------------------------

commit d21262e73caa1dcade72790f6639c9e56ffd8211
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sat Feb 6 10:35:42 2016 +0100

    Experimental fix for pretty:32
    
    https://github.com/haskell/pretty/issues/32


>---------------------------------------------------------------

d21262e73caa1dcade72790f6639c9e56ffd8211
 compiler/utils/Pretty.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/utils/Pretty.hs b/compiler/utils/Pretty.hs
index 74d69f2..ff70ddf 100644
--- a/compiler/utils/Pretty.hs
+++ b/compiler/utils/Pretty.hs
@@ -718,13 +718,13 @@ beside :: Doc -> Bool -> RDoc -> RDoc
 beside NoDoc               _ _   = NoDoc
 beside (p1 `Union` p2)     g q   = beside p1 g q `union_` beside p2 g q
 beside Empty               _ q   = q
-beside (Nest k p)          g q   = nest_ k $! beside p g q
+beside (Nest k p)          g q   = nest_ k $ beside p g q
 beside p@(Beside p1 g1 q1) g2 q2
-         | g1 == g2              = beside p1 g1 $! beside q1 g2 q2
+         | g1 == g2              = beside p1 g1 $ beside q1 g2 q2
          | otherwise             = beside (reduceDoc p) g2 q2
 beside p@(Above{})         g q   = let !d = reduceDoc p in beside d g q
-beside (NilAbove p)        g q   = nilAbove_ $! beside p g q
-beside (TextBeside s sl p) g q   = textBeside_ s sl $! rest
+beside (NilAbove p)        g q   = nilAbove_ $ beside p g q
+beside (TextBeside s sl p) g q   = textBeside_ s sl $ rest
                                where
                                   rest = case p of
                                            Empty -> nilBeside g q



More information about the ghc-commits mailing list