summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2018-06-26 15:29:14 +0200
committerGabor Greif <ggreif@gmail.com>2018-06-26 15:29:14 +0200
commit629d01a436d8041d44ed2826eb3f75e3f2d9ab47 (patch)
treeaf3f94eece0c57728aa9c50100df8b5e746d6998
parentbb50ecaf2930455a6ecb7268f9c0f2ee909f5361 (diff)
downloadhaskell-629d01a436d8041d44ed2826eb3f75e3f2d9ab47.tar.gz
Typofixes in comments and whitespace only [ci skip]
-rw-r--r--compiler/cmm/CmmType.hs2
-rw-r--r--compiler/main/TidyPgm.hs4
-rw-r--r--compiler/nativeGen/RegAlloc/Graph/Stats.hs12
-rw-r--r--compiler/types/TyCon.hs2
-rw-r--r--libraries/template-haskell/Language/Haskell/TH/Syntax.hs2
5 files changed, 11 insertions, 11 deletions
diff --git a/compiler/cmm/CmmType.hs b/compiler/cmm/CmmType.hs
index 0538b9fea3..97b181a243 100644
--- a/compiler/cmm/CmmType.hs
+++ b/compiler/cmm/CmmType.hs
@@ -70,7 +70,7 @@ instance Outputable CmmCat where
-- Why is CmmType stratified? For native code generation,
-- most of the time you just want to know what sort of register
-- to put the thing in, and for this you need to know how
--- many bits thing has and whether it goes in a floating-point
+-- many bits thing has, and whether it goes in a floating-point
-- register. By contrast, the distinction between GcPtr and
-- GcNonPtr is of interest to only a few parts of the code generator.
diff --git a/compiler/main/TidyPgm.hs b/compiler/main/TidyPgm.hs
index b67ade25dc..4e93439588 100644
--- a/compiler/main/TidyPgm.hs
+++ b/compiler/main/TidyPgm.hs
@@ -450,7 +450,7 @@ tidyProgram hsc_env (ModGuts { mg_module = mod
tidyTypeEnv :: Bool -- Compiling without -O, so omit prags
-> TypeEnv -> TypeEnv
--- The competed type environment is gotten from
+-- The completed type environment is gotten from
-- a) the types and classes defined here (plus implicit things)
-- b) adding Ids with correct IdInfo, including unfoldings,
-- gotten from the bindings
@@ -617,7 +617,7 @@ chooseExternalIds hsc_env mod omit_prags expose_all binds implicit_binds imp_id_
-- deterministic, tidy, renaming for all external Ids in this
-- module.
--
- -- It is sorted, so that it has adeterministic order (i.e. it's the
+ -- It is sorted, so that it has a deterministic order (i.e. it's the
-- same list every time this module is compiled), in contrast to the
-- bindings, which are ordered non-deterministically.
init_work_list = zip init_ext_ids init_ext_ids
diff --git a/compiler/nativeGen/RegAlloc/Graph/Stats.hs b/compiler/nativeGen/RegAlloc/Graph/Stats.hs
index e3ff226710..ba51a4c060 100644
--- a/compiler/nativeGen/RegAlloc/Graph/Stats.hs
+++ b/compiler/nativeGen/RegAlloc/Graph/Stats.hs
@@ -267,8 +267,8 @@ pprStatsConflict stats
$$ text "\n")
--- | For every vreg, dump it's how many conflicts it has and its lifetime
--- good for making a scatter plot.
+-- | For every vreg, dump how many conflicts it has, and its lifetime.
+-- Good for making a scatter plot.
pprStatsLifeConflict
:: [RegAllocStats statics instr]
-> Color.Graph VirtualReg RegClass RealReg -- ^ global register conflict graph
@@ -279,10 +279,10 @@ pprStatsLifeConflict stats graph
$ foldl' plusSpillCostInfo zeroSpillCostInfo
$ [ raSpillCosts s | s@RegAllocStatsStart{} <- stats ]
- scatter = map (\r -> let lifetime = case lookupUFM lifeMap r of
- Just (_, l) -> l
- Nothing -> 0
- Just node = Color.lookupNode graph r
+ scatter = map (\r -> let lifetime = case lookupUFM lifeMap r of
+ Just (_, l) -> l
+ Nothing -> 0
+ Just node = Color.lookupNode graph r
in parens $ hcat $ punctuate (text ", ")
[ doubleQuotes $ ppr $ Color.nodeId node
, ppr $ sizeUniqSet (Color.nodeConflicts node)
diff --git a/compiler/types/TyCon.hs b/compiler/types/TyCon.hs
index 3f91e77065..3801137420 100644
--- a/compiler/types/TyCon.hs
+++ b/compiler/types/TyCon.hs
@@ -1420,7 +1420,7 @@ So we compromise, and move their Kind calculation to the call site.
-}
-- | Given the name of the function type constructor and it's kind, create the
--- corresponding 'TyCon'. It is recomended to use 'TyCoRep.funTyCon' if you want
+-- corresponding 'TyCon'. It is recommended to use 'TyCoRep.funTyCon' if you want
-- this functionality
mkFunTyCon :: Name -> [TyConBinder] -> Name -> TyCon
mkFunTyCon name binders rep_nm
diff --git a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
index b6f7c34673..9665c65cf4 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
@@ -473,7 +473,7 @@ addForeignFile = addForeignSource
-- Note that for non-C languages (for example C++) @extern "C"@ directives
-- must be used to get symbols that we can access from Haskell.
--
--- To get better errors, it is reccomended to use #line pragmas when
+-- To get better errors, it is recommended to use #line pragmas when
-- emitting C files, e.g.
--
-- > {-# LANGUAGE CPP #-}