summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2017-02-13 15:32:49 +0100
committerGabor Greif <ggreif@gmail.com>2017-02-15 09:39:02 +0100
commite28fbbb7c3d5904a88b4743d0d10f212d61d8293 (patch)
tree9b3c164a321cdf3124fdd1eb562bdfd7eb77cd19
parent93e65c8ab7b468d69bf24d9dc2f197d24e5166f4 (diff)
downloadhaskell-e28fbbb7c3d5904a88b4743d0d10f212d61d8293.tar.gz
Typos [ci skip]
-rw-r--r--compiler/coreSyn/CoreUtils.hs4
-rw-r--r--compiler/hsSyn/HsExpr.hs2
-rw-r--r--compiler/prelude/TysWiredIn.hs2
-rw-r--r--compiler/rename/RnPat.hs2
-rw-r--r--compiler/simplCore/SetLevels.hs2
-rw-r--r--compiler/typecheck/TcSimplify.hs2
-rw-r--r--compiler/types/Type.hs2
-rw-r--r--docs/users_guide/glasgow_exts.rst2
-rw-r--r--rts/RetainerProfile.c2
-rw-r--r--rts/Trace.c2
-rw-r--r--testsuite/tests/programs/andy_cherry/Main.hs4
-rw-r--r--testsuite/tests/typecheck/should_compile/tc146.hs2
12 files changed, 14 insertions, 14 deletions
diff --git a/compiler/coreSyn/CoreUtils.hs b/compiler/coreSyn/CoreUtils.hs
index 7896382384..adc9acf018 100644
--- a/compiler/coreSyn/CoreUtils.hs
+++ b/compiler/coreSyn/CoreUtils.hs
@@ -1662,7 +1662,7 @@ dataConInstPat fss uniqs con inst_tys
-- Make the instantiating substitution for universals
univ_subst = zipTvSubst univ_tvs inst_tys
- -- Make existential type variables, applyingn and extending the substitution
+ -- Make existential type variables, applying and extending the substitution
(full_subst, ex_bndrs) = mapAccumL mk_ex_var univ_subst
(zip3 ex_tvs ex_fss ex_uniqs)
@@ -1844,7 +1844,7 @@ diffExpr _ _ e1 e2
-- all possible mappings, which would be seriously expensive. So
-- instead we simply match single bindings as far as we can. This
-- leaves us just with mutually recursive and/or mismatching bindings,
--- which we then specuatively match by ordering them. It's by no means
+-- which we then speculatively match by ordering them. It's by no means
-- perfect, but gets the job done well enough.
diffBinds :: Bool -> RnEnv2 -> [(Var, CoreExpr)] -> [(Var, CoreExpr)]
-> ([SDoc], RnEnv2)
diff --git a/compiler/hsSyn/HsExpr.hs b/compiler/hsSyn/HsExpr.hs
index 9ad096e6d7..71c408984b 100644
--- a/compiler/hsSyn/HsExpr.hs
+++ b/compiler/hsSyn/HsExpr.hs
@@ -2102,7 +2102,7 @@ instance Data ThModFinalizers where
data HsSplicedThing id
= HsSplicedExpr (HsExpr id) -- ^ Haskell Spliced Expression
| HsSplicedTy (HsType id) -- ^ Haskell Spliced Type
- | HsSplicedPat (Pat id) -- ^ Haskell Spilced Pattern
+ | HsSplicedPat (Pat id) -- ^ Haskell Spliced Pattern
deriving Typeable
deriving instance (DataId id) => Data (HsSplicedThing id)
diff --git a/compiler/prelude/TysWiredIn.hs b/compiler/prelude/TysWiredIn.hs
index b238201e6b..0eeb5e323a 100644
--- a/compiler/prelude/TysWiredIn.hs
+++ b/compiler/prelude/TysWiredIn.hs
@@ -34,7 +34,7 @@ module TysWiredIn (
gtDataCon, gtDataConId,
promotedLTDataCon, promotedEQDataCon, promotedGTDataCon,
- -- * Boxign primitive types
+ -- * Boxing primitive types
boxingDataCon_maybe,
-- * Char
diff --git a/compiler/rename/RnPat.hs b/compiler/rename/RnPat.hs
index c18138bc86..3417494e21 100644
--- a/compiler/rename/RnPat.hs
+++ b/compiler/rename/RnPat.hs
@@ -695,7 +695,7 @@ Consider (Trac #12130)
funny = [| MkT { x = 3 } |]
When we splice, neither T nor MkT are lexically in scope, so find_tycon will
-fail. But there is no need for diambiguation anyway, so we just return Nothing
+fail. But there is no need for disambiguation anyway, so we just return Nothing
-}
rnHsRecUpdFields
diff --git a/compiler/simplCore/SetLevels.hs b/compiler/simplCore/SetLevels.hs
index 27e5ade4e9..4fca18d9f2 100644
--- a/compiler/simplCore/SetLevels.hs
+++ b/compiler/simplCore/SetLevels.hs
@@ -506,7 +506,7 @@ Consider this:
}
Because of the binder-swap, the inner case will get substituted to
(case x of ..). So when testing whether the scrutinee is
-okForSpecuation we must be careful to test the *result* scrutinee ('x'
+okForSpeculation we must be careful to test the *result* scrutinee ('x'
in this case), not the *input* one 'y'. The latter *is* ok for
speculation here, but the former is not -- and indeed we can't float
the inner case out, at least not unless x is also evaluated at its
diff --git a/compiler/typecheck/TcSimplify.hs b/compiler/typecheck/TcSimplify.hs
index ee07e845b6..51bd273f07 100644
--- a/compiler/typecheck/TcSimplify.hs
+++ b/compiler/typecheck/TcSimplify.hs
@@ -1965,7 +1965,7 @@ to beta[1], and that means the (a ~ beta[1]) will be stuck, as it should be.
*********************************************************************************
* *
-* Defaulting and disamgiguation *
+* Defaulting and disambiguation *
* *
*********************************************************************************
-}
diff --git a/compiler/types/Type.hs b/compiler/types/Type.hs
index e13a1b9695..2cce7fe415 100644
--- a/compiler/types/Type.hs
+++ b/compiler/types/Type.hs
@@ -611,7 +611,7 @@ Note [Decomposing fat arrow c=>t]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Can we unify (a b) with (Eq a => ty)? If we do so, we end up with
a partial application like ((=>) Eq a) which doesn't make sense in
-source Haskell. In constrast, we *can* unify (a b) with (t1 -> t2).
+source Haskell. In contrast, we *can* unify (a b) with (t1 -> t2).
Here's an example (Trac #9858) of how you might do it:
i :: (Typeable a, Typeable b) => Proxy (a b) -> TypeRep
i p = typeRep p
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 550bca8949..dbb17351d3 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -146,7 +146,7 @@ specifies their runtime representation. For example, the type ``Int#`` has
kind ``TYPE 'IntRep`` and ``Double#`` has kind ``TYPE 'DoubleRep``. These
kinds say that the runtime representation of an ``Int#`` is a machine integer,
and the runtime representation of a ``Double#`` is a machine double-precision
-floating point. In constrast, the kind ``*`` is actually just a synonym
+floating point. In contrast, the kind ``*`` is actually just a synonym
for ``TYPE 'PtrRepLifted``. More details of the ``TYPE`` mechanisms appear in
the `section on runtime representation polymorphism <#runtime-rep>`__.
diff --git a/rts/RetainerProfile.c b/rts/RetainerProfile.c
index 3cbb8acc8c..901293761a 100644
--- a/rts/RetainerProfile.c
+++ b/rts/RetainerProfile.c
@@ -1837,7 +1837,7 @@ computeRetainerSet( void )
* and reset their rs fields to NULL, which is accomplished by
* invoking maybeInitRetainerSet(). This function must be called
* before zeroing all objects reachable from scavenged_static_objects
- * in the case of major gabage collections. See GarbageCollect() in
+ * in the case of major garbage collections. See GarbageCollect() in
* GC.c.
* Note:
* The mut_once_list of the oldest generation must also be traversed?
diff --git a/rts/Trace.c b/rts/Trace.c
index 07717f3ac3..3defedbe2f 100644
--- a/rts/Trace.c
+++ b/rts/Trace.c
@@ -42,7 +42,7 @@ static Mutex trace_utx;
static bool eventlog_enabled;
/* ---------------------------------------------------------------------------
- Starting up / shuttting down the tracing facilities
+ Starting up / shutting down the tracing facilities
--------------------------------------------------------------------------- */
static const EventLogWriter *getEventLogWriter(void)
diff --git a/testsuite/tests/programs/andy_cherry/Main.hs b/testsuite/tests/programs/andy_cherry/Main.hs
index aa4274ec59..f4b2ed827e 100644
--- a/testsuite/tests/programs/andy_cherry/Main.hs
+++ b/testsuite/tests/programs/andy_cherry/Main.hs
@@ -27,7 +27,7 @@
let (style,fn,filename) = interpArgs (words "-d tex mygames.pgn")
file <- readFile (test_dir ++ "/" ++filename)
std_in <- getContents
- let games = pgnParser fn file -- parse relavent pgn games
+ let games = pgnParser fn file -- parse relevant pgn games
putStr (prog style std_in games)
{- OLD 1.2:
@@ -37,7 +37,7 @@
let (style,fn,filename) = interpArgs args in
readFile filename abort $ \ file ->
readChan stdin abort $ \ std_in ->
- let games = pgnParser fn file -- parse relavent pgn games
+ let games = pgnParser fn file -- parse relevant pgn games
in
appendChan stdout (prog style std_in games) abort done
-}
diff --git a/testsuite/tests/typecheck/should_compile/tc146.hs b/testsuite/tests/typecheck/should_compile/tc146.hs
index bc50069983..5603c5ed78 100644
--- a/testsuite/tests/typecheck/should_compile/tc146.hs
+++ b/testsuite/tests/typecheck/should_compile/tc146.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE RankNTypes #-}
--- The interesting thign about this one is that
+-- The interesting thing about this one is that
-- there's an unbound type variable of kind *->*
-- that the typechecker should default to some
-- arbitrary type.