summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2016-09-28 15:28:38 +0200
committerGabor Greif <ggreif@gmail.com>2016-09-28 15:28:38 +0200
commit0b6024c6fc7c7226d9ba2373eb2a5b7a08311a2e (patch)
tree86564c908a13dacc7e264ad7f74dc92d84448c63
parentf897b7427a4804e3285144f57676574d338be1f5 (diff)
downloadhaskell-0b6024c6fc7c7226d9ba2373eb2a5b7a08311a2e.tar.gz
Comments and manual only: spelling
-rw-r--r--compiler/nativeGen/Dwarf/Types.hs2
-rw-r--r--compiler/typecheck/TcInteract.hs2
-rw-r--r--compiler/typecheck/TcRnTypes.hs2
-rw-r--r--compiler/typecheck/TcSplice.hs2
-rw-r--r--docs/users_guide/glasgow_exts.rst2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail096.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail130.hs2
7 files changed, 7 insertions, 7 deletions
diff --git a/compiler/nativeGen/Dwarf/Types.hs b/compiler/nativeGen/Dwarf/Types.hs
index 0db24194a2..0fcd926c53 100644
--- a/compiler/nativeGen/Dwarf/Types.hs
+++ b/compiler/nativeGen/Dwarf/Types.hs
@@ -152,7 +152,7 @@ pprDwarfInfo haveSrc d
noChildren = pprDwarfInfoOpen haveSrc d
-- | Prints assembler data corresponding to DWARF info records. Note
--- that the binary format of this is paramterized in @abbrevDecls@ and
+-- that the binary format of this is parameterized in @abbrevDecls@ and
-- has to be kept in synch.
pprDwarfInfoOpen :: Bool -> DwarfInfo -> SDoc
pprDwarfInfoOpen haveSrc (DwarfCompileUnit _ name producer compDir lowLabel
diff --git a/compiler/typecheck/TcInteract.hs b/compiler/typecheck/TcInteract.hs
index 298bbb2dc9..583ca622f9 100644
--- a/compiler/typecheck/TcInteract.hs
+++ b/compiler/typecheck/TcInteract.hs
@@ -1667,7 +1667,7 @@ Note [FunDep and implicit parameter reactions]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Currently, our story of interacting two dictionaries (or a dictionary
and top-level instances) for functional dependencies, and implicit
-paramters, is that we simply produce new Derived equalities. So for example
+parameters, is that we simply produce new Derived equalities. So for example
class D a b | a -> b where ...
Inert:
diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index 9bfebd5c03..6d956fe963 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -1916,7 +1916,7 @@ Note that
trigger superclass expansion. This was a good part of the loop
in Trac #11523
- * Even for Wanted constraints, we say "no" for implicit paramters.
+ * Even for Wanted constraints, we say "no" for implicit parameters.
we have [W] ?x::ty, expanding superclasses won't help:
- Superclasses can't be implicit parameters
- If we have a [G] ?x:ty2, then we'll have another unsolved
diff --git a/compiler/typecheck/TcSplice.hs b/compiler/typecheck/TcSplice.hs
index 861c3707fd..ed553234b5 100644
--- a/compiler/typecheck/TcSplice.hs
+++ b/compiler/typecheck/TcSplice.hs
@@ -1851,7 +1851,7 @@ reify_tc_app tc tys
reifyPred :: TyCoRep.PredType -> TcM TH.Pred
reifyPred ty
- -- We could reify the invisible paramter as a class but it seems
+ -- We could reify the invisible parameter as a class but it seems
-- nicer to support them properly...
| isIPPred ty = noTH (sLit "implicit parameters") (ppr ty)
| otherwise = reifyType ty
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 6af26b5815..b41a09a097 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -3383,7 +3383,7 @@ example), then we apply the function ``f`` directly to it. If a type is
encountered that is not syntactically equivalent to the last type parameter
*but does mention* the last type parameter somewhere in it, then a recursive
call to ``fmap`` is made. If a type is found which doesn't mention the last
-type paramter at all, then it is left alone.
+type parameter at all, then it is left alone.
The second of those cases, in which a type is unequal to the type parameter but
does contain the type parameter, can be surprisingly tricky. For example, the
diff --git a/testsuite/tests/typecheck/should_fail/tcfail096.hs b/testsuite/tests/typecheck/should_fail/tcfail096.hs
index c019bfbb96..41dfd90999 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail096.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail096.hs
@@ -6,7 +6,7 @@ class Foo f a r | f a -> r where
foo::f->a->r
-- These instances are incompatible because we can unify
--- the first two paramters, though it's rather obscure:
+-- the first two parameters, though it's rather obscure:
-- p -> (a,b)
-- t -> (,) (a,a)
-- c -> (,) a
diff --git a/testsuite/tests/typecheck/should_fail/tcfail130.hs b/testsuite/tests/typecheck/should_fail/tcfail130.hs
index 96101b534a..0d71120168 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail130.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail130.hs
@@ -1,7 +1,7 @@
{-# LANGUAGE ImplicitParams #-}
-- The defn of foo should be rejected; it's monomorphic, but
--- the implicit paramter escapes
+-- the implicit parameter escapes
module Foo where