[commit: ghc] wip/T9858-typeable-ben: Comments and white space (725ad45)
git at git.haskell.org
git at git.haskell.org
Wed Aug 26 14:12:29 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/T9858-typeable-ben
Link : http://ghc.haskell.org/trac/ghc/changeset/725ad45f30d476f510c491673ffa38d906e4f6bc/ghc
>---------------------------------------------------------------
commit 725ad45f30d476f510c491673ffa38d906e4f6bc
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Fri Mar 20 12:36:22 2015 +0000
Comments and white space
>---------------------------------------------------------------
725ad45f30d476f510c491673ffa38d906e4f6bc
compiler/basicTypes/Id.hs | 7 +++----
compiler/coreSyn/MkCore.hs | 1 +
compiler/iface/LoadIface.hs | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/compiler/basicTypes/Id.hs b/compiler/basicTypes/Id.hs
index 968b541..45a4aa7 100644
--- a/compiler/basicTypes/Id.hs
+++ b/compiler/basicTypes/Id.hs
@@ -308,9 +308,8 @@ mkTemplateLocals = mkTemplateLocalsNum 1
mkTemplateLocalsNum :: Int -> [Type] -> [Id]
mkTemplateLocalsNum n tys = zipWith mkTemplateLocal [n..] tys
-{-
-Note [Exported LocalIds]
-~~~~~~~~~~~~~~~~~~~~~~~~
+{- Note [Exported LocalIds]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
We use mkExportedLocalId for things like
- Dictionary functions (DFunId)
- Wrapper and matcher Ids for pattern synonyms
@@ -324,7 +323,7 @@ code by the occurrence analyser. (But "exported" here does not mean
"brought into lexical scope by an import declaration". Indeed these
things are always internal Ids that the user never sees.)
-It's very important that they are *LocalIds*, not GlobalIs, for lots
+It's very important that they are *LocalIds*, not GlobalIds, for lots
of reasons:
* We want to treat them as free variables for the purpose of
diff --git a/compiler/coreSyn/MkCore.hs b/compiler/coreSyn/MkCore.hs
index 4d310c9..8bdee4a 100644
--- a/compiler/coreSyn/MkCore.hs
+++ b/compiler/coreSyn/MkCore.hs
@@ -274,6 +274,7 @@ mkCharExpr c = mkConApp charDataCon [mkCharLit c]
-- | Create a 'CoreExpr' which will evaluate to the given @String@
mkStringExpr :: MonadThings m => String -> m CoreExpr -- Result :: String
+
-- | Create a 'CoreExpr' which will evaluate to a string morally equivalent to the given @FastString@
mkStringExprFS :: MonadThings m => FastString -> m CoreExpr -- Result :: String
diff --git a/compiler/iface/LoadIface.hs b/compiler/iface/LoadIface.hs
index 9da1175..60e3a8a 100644
--- a/compiler/iface/LoadIface.hs
+++ b/compiler/iface/LoadIface.hs
@@ -191,6 +191,7 @@ checkWiredInTyCon tc
= return ()
| otherwise
= do { mod <- getModule
+ ; traceIf (text "checkWiredInTyCon" <+> ppr tc_name $$ ppr mod)
; ASSERT( isExternalName tc_name )
when (mod /= nameModule tc_name)
(initIfaceTcRn (loadWiredInHomeIface tc_name))
@@ -360,7 +361,7 @@ loadInterfaceForModule doc m
-- | An 'IfM' function to load the home interface for a wired-in thing,
-- so that we're sure that we see its instance declarations and rules
--- See Note [Loading instances for wired-in things] in TcIface
+-- See Note [Loading instances for wired-in things]
loadWiredInHomeIface :: Name -> IfM lcl ()
loadWiredInHomeIface name
= ASSERT( isWiredInName name )
More information about the ghc-commits
mailing list