[commit: ghc] master: Comments and white space only (da4ff65)

Simon Peyton Jones simonpj at microsoft.com
Thu Jun 6 15:30:14 CEST 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/da4ff650ae77930a5a10d4886c8bc7d37f081db7

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

commit da4ff650ae77930a5a10d4886c8bc7d37f081db7
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri May 3 14:48:31 2013 +0100

    Comments and white space only

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

 compiler/cmm/CLabel.hs            | 6 +++---
 compiler/codeGen/StgCmmMonad.hs   | 4 ++--
 compiler/coreSyn/CoreUtils.lhs    | 4 ++--
 compiler/simplCore/SimplUtils.lhs | 1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
index 1bcb695..1b86f3d 100644
--- a/compiler/cmm/CLabel.hs
+++ b/compiler/cmm/CLabel.hs
@@ -1030,9 +1030,9 @@ pprCLbl (RtsLabel (RtsApFast str))   = ftext str <> ptext (sLit "_fast")
 
 pprCLbl (RtsLabel (RtsSelectorInfoTable upd_reqd offset))
   = hcat [ptext (sLit "stg_sel_"), text (show offset),
-                ptext (if upd_reqd
-                        then (sLit "_upd_info")
-                        else (sLit "_noupd_info"))
+          ptext (if upd_reqd
+                 then (sLit "_upd_info")
+                 else (sLit "_noupd_info"))
         ]
 
 pprCLbl (RtsLabel (RtsSelectorEntry upd_reqd offset))
diff --git a/compiler/codeGen/StgCmmMonad.hs b/compiler/codeGen/StgCmmMonad.hs
index 1f3d5c4..c0cd882 100644
--- a/compiler/codeGen/StgCmmMonad.hs
+++ b/compiler/codeGen/StgCmmMonad.hs
@@ -553,8 +553,8 @@ forkStatics :: FCode a -> FCode a
 -- The Abstract~C returned is attached to the current state, but the
 -- bindings and usage information is otherwise unchanged.
 forkStatics body_code
-  = do        { dflags <- getDynFlags
-              ; info  <- getInfoDown
+  = do  { dflags <- getDynFlags
+        ; info  <- getInfoDown
         ; us    <- newUniqSupply
         ; state <- getState
         ; let   rhs_info_down = info { cgd_statics = cgs_binds state
diff --git a/compiler/coreSyn/CoreUtils.lhs b/compiler/coreSyn/CoreUtils.lhs
index 4e45da4..3cdf2a6 100644
--- a/compiler/coreSyn/CoreUtils.lhs
+++ b/compiler/coreSyn/CoreUtils.lhs
@@ -567,8 +567,8 @@ getIdFromTrivialExpr e = go e
 \end{code}
 
 exprIsBottom is a very cheap and cheerful function; it may return
-False for bottoming expressions, but it never costs much to ask.
-See also CoreArity.exprBotStrictness_maybe, but that's a bit more
+False for bottoming expressions, but it never costs much to ask.  See
+also CoreArity.exprBotStrictness_maybe, but that's a bit more
 expensive.
 
 \begin{code}
diff --git a/compiler/simplCore/SimplUtils.lhs b/compiler/simplCore/SimplUtils.lhs
index 17da9be..c483f05 100644
--- a/compiler/simplCore/SimplUtils.lhs
+++ b/compiler/simplCore/SimplUtils.lhs
@@ -1126,6 +1126,7 @@ because the latter is not well-kinded.
 \begin{code}
 tryEtaExpand :: SimplEnv -> OutId -> OutExpr -> SimplM (Arity, OutExpr)
 -- See Note [Eta-expanding at let bindings]
+-- and Note [Eta expansion to manifest arity]
 tryEtaExpand env bndr rhs
   = do { dflags <- getDynFlags
        ; (new_arity, new_rhs) <- try_expand dflags





More information about the ghc-commits mailing list