summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2014-12-08 23:01:55 +0100
committerGabor Greif <ggreif@gmail.com>2014-12-08 23:37:59 +0100
commit2515686ff695169238b673423f01768f5aaa9750 (patch)
tree4928ef4a7295549fe26c8497c916b933419475d6
parent8688f6a5f652e8f41a19faf1a935073d85efffa0 (diff)
downloadhaskell-2515686ff695169238b673423f01768f5aaa9750.tar.gz
catch some recent typos
-rw-r--r--compiler/cmm/CmmType.hs2
-rw-r--r--compiler/main/PprTyThing.hs2
-rw-r--r--compiler/typecheck/Flattening-notes6
-rw-r--r--compiler/typecheck/TcCanonical.hs2
-rw-r--r--compiler/typecheck/TcDeriv.hs2
-rw-r--r--compiler/typecheck/TcErrors.hs2
-rw-r--r--compiler/typecheck/TcGenDeriv.hs2
-rw-r--r--compiler/typecheck/TcInteract.hs4
-rw-r--r--compiler/typecheck/TcType.hs2
-rw-r--r--libraries/ghc-prim/GHC/Types.hs2
-rw-r--r--testsuite/tests/perf/compiler/all.T2
11 files changed, 14 insertions, 14 deletions
diff --git a/compiler/cmm/CmmType.hs b/compiler/cmm/CmmType.hs
index 37d92c207d..f852d54b34 100644
--- a/compiler/cmm/CmmType.hs
+++ b/compiler/cmm/CmmType.hs
@@ -436,7 +436,7 @@ Cons:
Currently for GHC, the foreign call point is moot, because we do our
own promotion of sub-word-sized values to word-sized values. The Int8
-type is represnted by an Int# which is kept sign-extended at all times
+type is represented by an Int# which is kept sign-extended at all times
(this is slightly naughty, because we're making assumptions about the
C calling convention rather early on in the compiler). However, given
this, the cons outweigh the pros.
diff --git a/compiler/main/PprTyThing.hs b/compiler/main/PprTyThing.hs
index 240e63b5b6..3e48ec3a8a 100644
--- a/compiler/main/PprTyThing.hs
+++ b/compiler/main/PprTyThing.hs
@@ -74,7 +74,7 @@ See #7730, #8776 for details -}
--------------------
-- | Pretty-prints a 'FamInst' (type/data family instance) with its defining location.
pprFamInst :: FamInst -> SDoc
--- * For data instances we go via pprTyThing of the represntational TyCon,
+-- * For data instances we go via pprTyThing of the representational TyCon,
-- because there is already much cleverness associated with printing
-- data type declarations that I don't want to duplicate
-- * For type instances we print directly here; there is no TyCon
diff --git a/compiler/typecheck/Flattening-notes b/compiler/typecheck/Flattening-notes
index 657e91e0fa..ffe39ab5e5 100644
--- a/compiler/typecheck/Flattening-notes
+++ b/compiler/typecheck/Flattening-notes
@@ -37,7 +37,7 @@ such that
(WF2) if (a -f-> t) is in S, then t /= a
Definition: applying a generalised substitution.
-If S is a generalised subsitution
+If S is a generalised substitution
S(f,a) = t, if (a -fs-> t) in S, and fs >= f
= a, otherwise
Application extends naturally to types S(f,t)
@@ -62,7 +62,7 @@ A generalised substitution S is "inert" iff
----------------------------------------------------------------
Our main invariant:
- the inert CTyEqCans should be an inert generalised subsitution
+ the inert CTyEqCans should be an inert generalised substitution
----------------------------------------------------------------
Note that inertness is not the same as idempotence. To apply S to a
@@ -100,7 +100,7 @@ The idea is that
not satisfy (K1-3), then we remove it from S by "kicking it out",
and re-processing it.
-* Note that kicking out is a Bad Thing, becuase it means we have to
+* Note that kicking out is a Bad Thing, because it means we have to
re-process a constraint. The less we kick out, the better.
* Assume we have G>=G, G>=W, D>=D, and that's all. Then, when performing
diff --git a/compiler/typecheck/TcCanonical.hs b/compiler/typecheck/TcCanonical.hs
index 13aa8e724f..97ab0e83cf 100644
--- a/compiler/typecheck/TcCanonical.hs
+++ b/compiler/typecheck/TcCanonical.hs
@@ -815,7 +815,7 @@ canEqTyVarTyVar ev swapped tv1 tv2 co2
-- So tv1 is not a meta tyvar
-- If only one is a meta tyvar, put it on the left
- -- This is not because it'll be solved; but becuase
+ -- This is not because it'll be solved; but because
-- the floating step looks for meta tyvars on the left
| isMetaTyVar tv2 = True
diff --git a/compiler/typecheck/TcDeriv.hs b/compiler/typecheck/TcDeriv.hs
index d52a7216da..457720708f 100644
--- a/compiler/typecheck/TcDeriv.hs
+++ b/compiler/typecheck/TcDeriv.hs
@@ -557,7 +557,7 @@ deriveAutoTypeable auto_typeable done_specs tycl_decls
| spec <- done_specs
, className (earlyDSClass spec) == typeableClassName ]
-- Check if an automatically generated DS for deriving Typeable should be
- -- ommitted because the user had manually requested an instance
+ -- omitted because the user had manually requested an instance
do_one cls (L _ decl)
= do { tc <- tcLookupTyCon (tcdName decl)
diff --git a/compiler/typecheck/TcErrors.hs b/compiler/typecheck/TcErrors.hs
index 6409d6d186..56c33b15fe 100644
--- a/compiler/typecheck/TcErrors.hs
+++ b/compiler/typecheck/TcErrors.hs
@@ -1467,7 +1467,7 @@ relevantBindings want_filtering ctxt ct
ct_tvs = tyVarsOfCt ct `unionVarSet` extra_tvs
-- For *kind* errors, report the relevant bindings of the
- -- enclosing *type* equality, becuase that's more useful for the programmer
+ -- enclosing *type* equality, because that's more useful for the programmer
extra_tvs = case ctLocOrigin loc of
KindEqOrigin t1 t2 _ -> tyVarsOfTypes [t1,t2]
_ -> emptyVarSet
diff --git a/compiler/typecheck/TcGenDeriv.hs b/compiler/typecheck/TcGenDeriv.hs
index 57adb1ccab..c9281088ed 100644
--- a/compiler/typecheck/TcGenDeriv.hs
+++ b/compiler/typecheck/TcGenDeriv.hs
@@ -2316,7 +2316,7 @@ We often want to make a top-level auxiliary binding. E.g. for comparison we hae
Of course these top-level bindings should all have distinct name, and we are
generating RdrNames here. We can't just use the TyCon or DataCon to distinguish
-becuase with standalone deriving two imported TyCons might both be called T!
+because with standalone deriving two imported TyCons might both be called T!
(See Trac #7947.)
So we use the *unique* from the parent name (T in this example) as part of the
diff --git a/compiler/typecheck/TcInteract.hs b/compiler/typecheck/TcInteract.hs
index c6e9fb6324..edb3303abd 100644
--- a/compiler/typecheck/TcInteract.hs
+++ b/compiler/typecheck/TcInteract.hs
@@ -968,7 +968,7 @@ kick_out new_ev new_tv (IC { inert_eqs = tv_eqs
-- NB: Notice that don't rewrite
-- inert_solved_dicts, and inert_solved_funeqs
-- optimistically. But when we lookup we have to
- -- take the subsitution into account
+ -- take the substitution into account
inert_cans_in = IC { inert_eqs = tv_eqs_in
, inert_dicts = dicts_in
, inert_funeqs = feqs_in
@@ -2270,7 +2270,7 @@ instance would fail:
But MkT was in scope, *and* if we used it before decomposing on T,
we'd unwrap the newtype (on both sides) to get
Coercible Bool (F Int)
-whic succeeds.
+which succeeds.
So our current decision is to apply case 3 (newtype-unwrapping) first,
followed by decomposition (case 4). This is strictly more powerful
diff --git a/compiler/typecheck/TcType.hs b/compiler/typecheck/TcType.hs
index 74c5ff4b48..5945bdecfa 100644
--- a/compiler/typecheck/TcType.hs
+++ b/compiler/typecheck/TcType.hs
@@ -1274,7 +1274,7 @@ Here we need to instantiate 'error' with a polytype.
But 'error' has an OpenTypeKind type variable, precisely so that
we can instantiate it with Int#. So we also allow such type variables
-to be instantiate with foralls. It's a bit of a hack, but seems
+to be instantiated with foralls. It's a bit of a hack, but seems
straightforward.
************************************************************************
diff --git a/libraries/ghc-prim/GHC/Types.hs b/libraries/ghc-prim/GHC/Types.hs
index 0f1d9610ef..9cc941012b 100644
--- a/libraries/ghc-prim/GHC/Types.hs
+++ b/libraries/ghc-prim/GHC/Types.hs
@@ -161,7 +161,7 @@ data (~) a b = Eq# ((~#) a b)
--
-- /Since: 4.7.0.0/
data Coercible a b = MkCoercible ((~#) a b)
--- It's really ~R# (represntational equality), not ~#,
+-- It's really ~R# (representational equality), not ~#,
-- but * we don't yet have syntax for ~R#,
-- * the compiled code is the same either way
-- * TysWiredIn has the truthful types
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index 0023ce83c1..5eda5a20af 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -405,7 +405,7 @@ test('T5321Fun',
# 15/05/2013: 628341952 # (reason for decrease unknown)
# 24/06/2013: 694019152 # (reason for re-increase unknown)
# 12/05/2014: 614409344 # (specialisation and inlining changes)
- # 10/09/2014: 601629032 # post-AMP-cleanp
+ # 10/09/2014: 601629032 # post-AMP-cleanup
# 06/11/2014: 541287000 # Simon's flat-skol changes to the constraint solver
],
compile,[''])