summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2015-12-08 16:43:34 +0100
committerGabor Greif <ggreif@gmail.com>2015-12-08 16:43:34 +0100
commitd7729c75c666bfeff2a70869c0613ea429202f11 (patch)
tree8573fe2a6b469e5e8a2492fcb3226e624a0e4a7a /compiler
parent6c794c311d5312ba3f92434ee6f35040d3b69353 (diff)
downloadhaskell-d7729c75c666bfeff2a70869c0613ea429202f11.tar.gz
An assortment of typos
Diffstat (limited to 'compiler')
-rw-r--r--compiler/basicTypes/Var.hs2
-rw-r--r--compiler/deSugar/DsBinds.hs2
-rw-r--r--compiler/hsSyn/HsBinds.hs6
-rw-r--r--compiler/main/HscMain.hs2
-rw-r--r--compiler/typecheck/TcRnTypes.hs2
5 files changed, 7 insertions, 7 deletions
diff --git a/compiler/basicTypes/Var.hs b/compiler/basicTypes/Var.hs
index dba00d350a..87658b542e 100644
--- a/compiler/basicTypes/Var.hs
+++ b/compiler/basicTypes/Var.hs
@@ -196,7 +196,7 @@ symbols will appear in the linker symbol table.
However, note that this use of "exported" is quite different to the
export list on a Haskell module. Setting the ExportFlag on an Id does
-/not/ mean that if you import the module (in Haskell source code you
+/not/ mean that if you import the module (in Haskell source code) you
will see this Id. Of course, things that appear in the export list
of the source Haskell module do indeed have their ExportFlag set.
But many other things, such as dictionary functions, are kept alive
diff --git a/compiler/deSugar/DsBinds.hs b/compiler/deSugar/DsBinds.hs
index 0da90f0003..724da24875 100644
--- a/compiler/deSugar/DsBinds.hs
+++ b/compiler/deSugar/DsBinds.hs
@@ -521,7 +521,7 @@ Here `tm` is the monomorphic binding for `rhs`.
With `Strict`, we want to force `tm`, but NOT `fm` or `gm`.
Alas, `tm` isn't in scope in the `in <body>` part.
-The simplest thing is to return it in the polymoprhic
+The simplest thing is to return it in the polymorphic
tuple `t`, thus:
let t = /\a. letrec tm = rhs[fm,gm]
diff --git a/compiler/hsSyn/HsBinds.hs b/compiler/hsSyn/HsBinds.hs
index 79206d717f..cbd45d8edb 100644
--- a/compiler/hsSyn/HsBinds.hs
+++ b/compiler/hsSyn/HsBinds.hs
@@ -305,7 +305,7 @@ you were defining) appears in the abe_poly field of the
abs_exports. The bindings in abs_binds are for fresh, local, Ids with
a *monomorphic* Id.
-If there is a group of mutually recursive (see Note [Polymoprhic
+If there is a group of mutually recursive (see Note [Polymorphic
recursion]) functions without type signatures, we get one AbsBinds
with the monomorphic versions of the bindings in abs_binds, and one
element of abe_exports for each variable bound in the mutually
@@ -319,7 +319,7 @@ After type checking we get
, abe_mono = g :: a -> a }]
, abs_binds = { (f,g) = (\x -> x, f) }
-Note [Polymoprhic recursion]
+Note [Polymorphic recursion]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Consider
Rec { f x = ...(g ef)...
@@ -348,7 +348,7 @@ up with
; AbsBinds { ...for g ... } }
This approach allows both f and to call each other
-polymoprhically, even though only g has a signature.
+polymorphically, even though only g has a signature.
We get an AbsBinds that encompasses multiple source-program
bindings only when
diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs
index 401f049f2b..bd0fa19e03 100644
--- a/compiler/main/HscMain.hs
+++ b/compiler/main/HscMain.hs
@@ -798,7 +798,7 @@ hscFileFrontEnd mod_summary = do
-- Note [Safe Haskell Inference]
-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- Safe Haskell does Safe inference on modules that don't have any specific
--- safe haskell mode flag. The basic aproach to this is:
+-- safe haskell mode flag. The basic approach to this is:
-- * When deciding if we need to do a Safe language check, treat
-- an unmarked module as having -XSafe mode specified.
-- * For checks, don't throw errors but return them to the caller.
diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index 0e8f682082..b5748f4f99 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -1142,7 +1142,7 @@ data TcIdSigInfo
data TcIdSigBndr -- See Note [Complete and partial type signatures]
= CompleteSig -- A complete signature with no wildards,
-- so the complete polymorphic type is known.
- TcId -- The polymoprhic Id with that type
+ TcId -- The polymorphic Id with that type
| PartialSig -- A partial type signature (i.e. includes one or more
-- wildcards). In this case it doesn't make sense to give