summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2018-01-17 14:05:48 +0100
committerGabor Greif <ggreif@gmail.com>2018-01-17 14:14:53 +0100
commitc65104e1a6875f7879db87877848cc35363c1bf3 (patch)
treeac290e4dc3ccd778d9e6565ffd73e93dc6d2d288
parentcf2c029ccdb967441c85ffb66073974fbdb20c20 (diff)
downloadhaskell-c65104e1a6875f7879db87877848cc35363c1bf3.tar.gz
Typos in comments
-rw-r--r--compiler/basicTypes/RdrName.hs2
-rw-r--r--compiler/codeGen/StgCmmHeap.hs2
-rw-r--r--compiler/coreSyn/MkCore.hs2
-rw-r--r--compiler/deSugar/Desugar.hs4
-rw-r--r--compiler/iface/BinIface.hs2
-rw-r--r--compiler/main/TidyPgm.hs2
-rw-r--r--compiler/simplCore/CallArity.hs2
-rw-r--r--compiler/simplCore/OccurAnal.hs2
-rw-r--r--compiler/typecheck/TcPatSyn.hs2
-rw-r--r--compiler/typecheck/TcSMonad.hs2
-rw-r--r--compiler/typecheck/TcSimplify.hs2
-rw-r--r--mk/warnings.mk4
12 files changed, 14 insertions, 14 deletions
diff --git a/compiler/basicTypes/RdrName.hs b/compiler/basicTypes/RdrName.hs
index 7d1c01a49a..2ff0be30d1 100644
--- a/compiler/basicTypes/RdrName.hs
+++ b/compiler/basicTypes/RdrName.hs
@@ -1040,7 +1040,7 @@ There are two reasons for shadowing:
hence the `mk_fake-imp_spec` in `shadowName`. See also Note
[Interactively-bound Ids in GHCi] in HscTypes
- - Data types also have Extenal Names, like Ghci4.T; but we still want
+ - Data types also have External Names, like Ghci4.T; but we still want
'T' to mean the newly-declared 'T', not an old one.
* Nested Template Haskell declaration brackets
diff --git a/compiler/codeGen/StgCmmHeap.hs b/compiler/codeGen/StgCmmHeap.hs
index 790453619c..2a1165395c 100644
--- a/compiler/codeGen/StgCmmHeap.hs
+++ b/compiler/codeGen/StgCmmHeap.hs
@@ -149,7 +149,7 @@ emitSetDynHdr base info_ptr ccs
where
header :: DynFlags -> [CmmExpr]
header dflags = [info_ptr] ++ dynProfHdr dflags ccs
- -- ToDof: Parallel stuff
+ -- ToDo: Parallel stuff
-- No ticky header
-- Store the item (expr,off) in base[off]
diff --git a/compiler/coreSyn/MkCore.hs b/compiler/coreSyn/MkCore.hs
index 3e5d8cd71c..49a9e9dbbd 100644
--- a/compiler/coreSyn/MkCore.hs
+++ b/compiler/coreSyn/MkCore.hs
@@ -337,7 +337,7 @@ We could do one of two things:
* Flatten it out, so that
mkCoreTup [e1] = e1
-* Built a one-tuple (see Note [One-tuples] in TysWiredIn)
+* Build a one-tuple (see Note [One-tuples] in TysWiredIn)
mkCoreTup1 [e1] = Unit e1
We use a suffix "1" to indicate this.
diff --git a/compiler/deSugar/Desugar.hs b/compiler/deSugar/Desugar.hs
index 6351fa87ba..518f02f1a0 100644
--- a/compiler/deSugar/Desugar.hs
+++ b/compiler/deSugar/Desugar.hs
@@ -247,7 +247,7 @@ Note [Top-level evidence]
~~~~~~~~~~~~~~~~~~~~~~~~~
Top-level evidence bindings may be mutually recursive with the top-level value
bindings, so we must put those in a Rec. But we can't put them *all* in a Rec
-because the occurrence analyser doesn't teke account of type/coercion variables
+because the occurrence analyser doesn't take account of type/coercion variables
when computing dependencies.
So we pull out the type/coercion variables (which are in dependency order),
@@ -544,7 +544,7 @@ about this. For example in Control.Arrow we have
and similar, which will elicit exactly these warnings, and risk never
firing. But it's not clear what to do instead. We could make the
-class methocd rules inactive in phase 2, but that would delay when
+class method rules inactive in phase 2, but that would delay when
subsequent transformations could fire.
diff --git a/compiler/iface/BinIface.hs b/compiler/iface/BinIface.hs
index 31b5af0e86..2a4696a541 100644
--- a/compiler/iface/BinIface.hs
+++ b/compiler/iface/BinIface.hs
@@ -223,7 +223,7 @@ writeBinIface dflags hi_path mod_iface = do
-- NB. write the dictionary after the symbol table, because
-- writing the symbol table may create more dictionary entries.
- -- Write the dictionary pointer at the fornt of the file
+ -- Write the dictionary pointer at the front of the file
dict_p <- tellBin bh -- This is where the dictionary will start
putAt bh dict_p_p dict_p -- Fill in the placeholder
seekBin bh dict_p -- Seek back to the end of the file
diff --git a/compiler/main/TidyPgm.hs b/compiler/main/TidyPgm.hs
index 1b94d834d9..ce8ac53919 100644
--- a/compiler/main/TidyPgm.hs
+++ b/compiler/main/TidyPgm.hs
@@ -224,7 +224,7 @@ Plan B: include pragmas, make interfaces
* Step 1: Figure out which Ids are externally visible
See Note [Choosing external Ids]
-* Step 2: Gather the extenally visible rules, separately from
+* Step 2: Gather the externally visible rules, separately from
the top-level bindings.
See Note [Finding external rules]
diff --git a/compiler/simplCore/CallArity.hs b/compiler/simplCore/CallArity.hs
index 4935db076c..64684f3c44 100644
--- a/compiler/simplCore/CallArity.hs
+++ b/compiler/simplCore/CallArity.hs
@@ -406,7 +406,7 @@ published papers on Call Arity describe it.
In practice, there are thunks that do a just little work, such as
pattern-matching on a variable, and the benefits of eta-expansion likely
-oughtweigh the cost of doing that repeatedly. Therefore, this implementation of
+outweigh the cost of doing that repeatedly. Therefore, this implementation of
Call Arity considers everything that is not cheap (`exprIsCheap`) as a thunk.
Note [Call Arity and Join Points]
diff --git a/compiler/simplCore/OccurAnal.hs b/compiler/simplCore/OccurAnal.hs
index b0987d5da0..b7fc977c9f 100644
--- a/compiler/simplCore/OccurAnal.hs
+++ b/compiler/simplCore/OccurAnal.hs
@@ -2088,7 +2088,7 @@ type GlobalScruts = IdSet -- See Note [Binder swap on GlobalId scrutinees]
-- x = (p,q) -- Don't inline p or q
-- y = /\a -> (p a, q a) -- Still don't inline p or q
-- z = f (p,q) -- Do inline p,q; it may make a rule fire
--- So OccEncl tells enought about the context to know what to do when
+-- So OccEncl tells enough about the context to know what to do when
-- we encounter a constructor application or PAP.
data OccEncl
diff --git a/compiler/typecheck/TcPatSyn.hs b/compiler/typecheck/TcPatSyn.hs
index b89c4bed63..a5526d267b 100644
--- a/compiler/typecheck/TcPatSyn.hs
+++ b/compiler/typecheck/TcPatSyn.hs
@@ -360,7 +360,7 @@ Here 'k' is implicitly bound in the signature, but (with
-XScopedTypeVariables) it does still scope over the pattern-synonym
definition. But what about 'kk', which is oexistential? It too is
implicitly bound in the signature; should it too scope? And if so,
-what type varaible is it bound to?
+what type variable is it bound to?
The trouble is that the type variable to which it is bound is itself
only brought into scope in part the pattern, so it makes no sense for
diff --git a/compiler/typecheck/TcSMonad.hs b/compiler/typecheck/TcSMonad.hs
index d79a8a465a..60c3ea670f 100644
--- a/compiler/typecheck/TcSMonad.hs
+++ b/compiler/typecheck/TcSMonad.hs
@@ -870,7 +870,7 @@ The idea is that
(NB: we could strengten K1) in this way too, but see K3.
- (K2b): If this holds then, by (T2), b is not in t. So applying the
- work item does not genenerate any new opportunities for applying S
+ work item does not generate any new opportunities for applying S
- (K2c): If this holds, we can't pass through this triple infinitely
often, because if we did then fs>=f, fw>=f, hence by (R2)
diff --git a/compiler/typecheck/TcSimplify.hs b/compiler/typecheck/TcSimplify.hs
index 72c9af94b8..942a40a43e 100644
--- a/compiler/typecheck/TcSimplify.hs
+++ b/compiler/typecheck/TcSimplify.hs
@@ -1098,7 +1098,7 @@ decideQuantifiedTyVars mono_tvs name_taus psigs candidates
; return (qtvs, co_vars) }
-- Return all the CoVars that (transitively) might be mentioned
-- in the tau_tys etc. We don't need to do a closeOverKinds on
- -- co_vars to get the transitive ones, becuase the grown_tvs
+ -- co_vars to get the transitive ones, because the grown_tvs
-- are already closed over kinds, and hence contain all such
-- co_vars
diff --git a/mk/warnings.mk b/mk/warnings.mk
index 69990a75c5..9426db2a1d 100644
--- a/mk/warnings.mk
+++ b/mk/warnings.mk
@@ -11,8 +11,8 @@ SRC_HC_OPTS += -Wall
SRC_HC_OPTS_STAGE1 += $(WERROR)
SRC_HC_OPTS_STAGE2 += $(WERROR)
-# Enable -Wcpp-undef for GHC components only as we don't (currently) expect core
-# libraries to build in this configuration (see #13636).
+# Enable -Wcpp-undef for GHC components only, as we don't (currently) expect
+# core libraries to build in this configuration (see #13636).
GhcRtsHcOpts += -Wcpp-undef
GhcStage1HcOpts += -Wcpp-undef
GhcStage2HcOpts += -Wcpp-undef