summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2015-03-20 12:36:22 +0000
committerBen Gamari <ben@smart-cactus.org>2015-08-26 20:24:38 +0200
commit0f3335fe45229c5790529e5fc7484c77bdae7668 (patch)
tree6cc20a96ad8f0f13b0be7cd69c1adc95ffc85fd8
parent1c643bad99f7afb485ec9998b1bb5afd49edafb7 (diff)
downloadhaskell-0f3335fe45229c5790529e5fc7484c77bdae7668.tar.gz
Comments and white space
-rw-r--r--compiler/basicTypes/Id.hs7
-rw-r--r--compiler/coreSyn/MkCore.hs1
-rw-r--r--compiler/iface/LoadIface.hs3
3 files changed, 6 insertions, 5 deletions
diff --git a/compiler/basicTypes/Id.hs b/compiler/basicTypes/Id.hs
index 968b541411..45a4aa75b3 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 4d310c9552..8bdee4ae5f 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 9da1175a5d..60e3a8a446 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 )