summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2016-12-01 18:46:35 +0100
committerGabor Greif <ggreif@gmail.com>2016-12-01 19:38:09 +0100
commit0f37550c797b08b953049fb84f6ea127e4d7668c (patch)
treeec45e3a68b038e6c9f88263769da3d82ff1d14f2 /compiler
parent6576bf83cdf4eac05eb88a24aa934a736c91e3da (diff)
downloadhaskell-0f37550c797b08b953049fb84f6ea127e4d7668c.tar.gz
Typos in comments
Diffstat (limited to 'compiler')
-rw-r--r--compiler/coreSyn/MkCore.hs2
-rw-r--r--compiler/main/DynFlags.hs4
-rw-r--r--compiler/main/HeaderInfo.hs2
-rw-r--r--compiler/typecheck/TcDeriv.hs2
-rw-r--r--compiler/typecheck/TcFlatten.hs2
-rw-r--r--compiler/typecheck/TcSMonad.hs2
6 files changed, 7 insertions, 7 deletions
diff --git a/compiler/coreSyn/MkCore.hs b/compiler/coreSyn/MkCore.hs
index e7fc7f9608..77027fceb0 100644
--- a/compiler/coreSyn/MkCore.hs
+++ b/compiler/coreSyn/MkCore.hs
@@ -750,7 +750,7 @@ mkRuntimeErrorId name
'error' and 'undefined' have types
error :: forall (v :: RuntimeRep) (a :: TYPE v). String -> a
undefined :: forall (v :: RuntimeRep) (a :: TYPE v). a
-Notice the runtime-representation polymophism. This ensures that
+Notice the runtime-representation polymorphism. This ensures that
"error" can be instantiated at unboxed as well as boxed types.
This is OK because it never returns, so the return type is irrelevant.
-}
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 30bfa5ea7d..cbf247c49d 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -893,7 +893,7 @@ data DynFlags = DynFlags {
nextWrapperNum :: IORef (ModuleEnv Int),
- -- | Machine dependant flags (-m<blah> stuff)
+ -- | Machine dependent flags (-m<blah> stuff)
sseVersion :: Maybe SseVersion,
avx :: Bool,
avx2 :: Bool,
@@ -2969,7 +2969,7 @@ dynamic_flags_deps = [
(NoArg (setGeneralFlag Opt_NoLlvmMangler)) -- hidden flag
, make_ord_flag defGhcFlag "ddump-debug" (setDumpFlag Opt_D_dump_debug)
- ------ Machine dependant (-m<blah>) stuff ---------------------------
+ ------ Machine dependent (-m<blah>) stuff ---------------------------
, make_ord_flag defGhcFlag "msse" (noArg (\d ->
d { sseVersion = Just SSE1 }))
diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs
index 5c8c89334c..2c27de156c 100644
--- a/compiler/main/HeaderInfo.hs
+++ b/compiler/main/HeaderInfo.hs
@@ -97,7 +97,7 @@ mkPrelImports :: ModuleName
-> SrcSpan -- Attribute the "import Prelude" to this location
-> Bool -> [LImportDecl RdrName]
-> [LImportDecl RdrName]
--- Consruct the implicit declaration "import Prelude" (or not)
+-- Construct the implicit declaration "import Prelude" (or not)
--
-- NB: opt_NoImplicitPrelude is slightly different to import Prelude ();
-- because the former doesn't even look at Prelude.hi for instance
diff --git a/compiler/typecheck/TcDeriv.hs b/compiler/typecheck/TcDeriv.hs
index 7c1857a779..f3b5e6a987 100644
--- a/compiler/typecheck/TcDeriv.hs
+++ b/compiler/typecheck/TcDeriv.hs
@@ -368,7 +368,7 @@ Consider this (see Trac #1954):
newtype P a = MkP (IO a) deriving Monad
If you compile with -Wunused-binds you do not expect the warning
-"Defined but not used: data consructor MkP". Yet the newtype deriving
+"Defined but not used: data constructor MkP". Yet the newtype deriving
code does not explicitly mention MkP, but it should behave as if you
had written
instance Monad P where
diff --git a/compiler/typecheck/TcFlatten.hs b/compiler/typecheck/TcFlatten.hs
index 4fc8414255..94fdfb8c3f 100644
--- a/compiler/typecheck/TcFlatten.hs
+++ b/compiler/typecheck/TcFlatten.hs
@@ -1322,7 +1322,7 @@ It is easy to implement, in TcInteract.kick_out, by only kicking out an inert
only if (a) the work item can rewrite the inert AND
(b) the inert cannot rewrite the work item
-This is signifcantly harder to think about. It can save a LOT of work
+This is significantly harder to think about. It can save a LOT of work
in occurs-check cases, but we don't care about them much. Trac #5837
is an example; all the constraints here are Givens
diff --git a/compiler/typecheck/TcSMonad.hs b/compiler/typecheck/TcSMonad.hs
index cff667ed12..1f1705dc8a 100644
--- a/compiler/typecheck/TcSMonad.hs
+++ b/compiler/typecheck/TcSMonad.hs
@@ -1155,7 +1155,7 @@ Note [Do not do improvement for WOnly]
We do improvement between two constraints (e.g. for injectivity
or functional dependencies) only if both are "improvable". And
we improve a constraint wrt the top-level instances only if
-it is improveable.
+it is improvable.
Improvable: [G] [WD] [D}
Not improvable: [W]