summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2017-02-15 18:13:26 +0100
committerGabor Greif <ggreif@gmail.com>2017-02-20 15:30:35 +0100
commit0aafe5191c3c4b83cc414fb5cb31d2e6f100bee0 (patch)
treeb67637891214bdac16ab3f2c4d1ec7919e5456f5
parentdae50032c1f17e49d115c853752259c35cc9840c (diff)
downloadhaskell-0aafe5191c3c4b83cc414fb5cb31d2e6f100bee0.tar.gz
Typos in manual, tests and comments
-rw-r--r--compiler/coreSyn/CorePrep.hs2
-rw-r--r--compiler/coreSyn/CoreSyn.hs2
-rw-r--r--compiler/typecheck/TcPatSyn.hs2
-rw-r--r--compiler/typecheck/TcSMonad.hs4
-rw-r--r--compiler/typecheck/TcTyClsDecls.hs2
-rw-r--r--compiler/typecheck/TcType.hs2
-rw-r--r--compiler/types/TyCon.hs2
-rw-r--r--compiler/types/Unify.hs2
-rw-r--r--docs/users_guide/ghci.rst2
-rw-r--r--testsuite/tests/indexed-types/should_fail/T4485.hs2
-rw-r--r--testsuite/tests/programs/andy_cherry/andy_cherry.stdout2
-rw-r--r--testsuite/tests/programs/andy_cherry/mygames.pgn2
12 files changed, 13 insertions, 13 deletions
diff --git a/compiler/coreSyn/CorePrep.hs b/compiler/coreSyn/CorePrep.hs
index db0e996d34..5327acddf0 100644
--- a/compiler/coreSyn/CorePrep.hs
+++ b/compiler/coreSyn/CorePrep.hs
@@ -273,7 +273,7 @@ b) The top-level binding is marked NoCafRefs. This really happens
$fApplicativeSTM [NoCafRefs] = D:Alternative sat ...blah...
So, gruesomely, we must set the NoCafRefs flag on the sat bindings,
- *and* substutite the modified 'sat' into the old RHS.
+ *and* substitute the modified 'sat' into the old RHS.
It should be the case that 'sat' is itself [NoCafRefs] (a value, no
cafs) else the original top-level binding would not itself have been
diff --git a/compiler/coreSyn/CoreSyn.hs b/compiler/coreSyn/CoreSyn.hs
index 9d42f7a28c..fb4b3bd4d5 100644
--- a/compiler/coreSyn/CoreSyn.hs
+++ b/compiler/coreSyn/CoreSyn.hs
@@ -1076,7 +1076,7 @@ has two major consequences
instance Eq T where ....
The instance (Eq T) is incorprated as part of T's fingerprint.
- In constrast, orphans are all fingerprinted together in the
+ In contrast, orphans are all fingerprinted together in the
mi_orph_hash field of the ModIface.
See MkIface.addFingerprints.
diff --git a/compiler/typecheck/TcPatSyn.hs b/compiler/typecheck/TcPatSyn.hs
index 587e2b8806..cbeb231cbd 100644
--- a/compiler/typecheck/TcPatSyn.hs
+++ b/compiler/typecheck/TcPatSyn.hs
@@ -160,7 +160,7 @@ tcCheckPatSynDecl psb@PSB{ psb_id = lname@(L _ name), psb_args = details
; traceTc "tcpatsyn2" (vcat [ ppr v <+> dcolon <+> ppr (tyVarKind v) | v <- ex_tvs'])
; let prov_theta' = substTheta subst prov_theta
-- Add univ_tvs to the in_scope set to
- -- satisfy the substition invariant. There's no need to
+ -- satisfy the substitution invariant. There's no need to
-- add 'ex_tvs' as they are already in the domain of the
-- substitution.
-- See also Note [The substitution invariant] in TyCoRep.
diff --git a/compiler/typecheck/TcSMonad.hs b/compiler/typecheck/TcSMonad.hs
index 19186c2528..4e6097bd62 100644
--- a/compiler/typecheck/TcSMonad.hs
+++ b/compiler/typecheck/TcSMonad.hs
@@ -212,7 +212,7 @@ example.
So we arrange to put these particular class constraints in the wl_eqs.
- NB: since we do not currently apply the substition to the
+ NB: since we do not currently apply the substitution to the
inert_solved_dicts, the knot-tying still seems a bit fragile.
But this makes it better.
-}
@@ -795,7 +795,7 @@ Theorem [Stability under extension]
a not in s, OR
the path from the top of s to a includes at least one non-newtype
- then the extended substition T = S+(a -fw-> t)
+ then the extended substitution T = S+(a -fw-> t)
is an inert generalised substitution.
Conditions (T1-T3) are established by the canonicaliser
diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index a66f401603..5f3f0ed6ff 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -1959,7 +1959,7 @@ mkGADTVars tmpl_tvs dc_tvs subst
choose :: [TyVar] -- accumulator of univ tvs, reversed
-> [EqSpec] -- accumulator of GADT equalities, reversed
- -> TCvSubst -- template substutition
+ -> TCvSubst -- template substitution
-> TCvSubst -- res. substitution
-> [TyVar] -- template tvs (the univ tvs passed in)
-> ( [TyVar] -- the univ_tvs
diff --git a/compiler/typecheck/TcType.hs b/compiler/typecheck/TcType.hs
index 7a87a18939..7e5c0b054b 100644
--- a/compiler/typecheck/TcType.hs
+++ b/compiler/typecheck/TcType.hs
@@ -1479,7 +1479,7 @@ tcRepSplitTyConApp_maybe _ = Nothing
-- currently don't even enough information to fully determine its RuntimeRep
-- variables. For instance, @FunTy (a :: k) Int@.
--
--- By constrast 'tcRepSplitTyConApp_maybe' panics in the second case.
+-- By contrast 'tcRepSplitTyConApp_maybe' panics in the second case.
--
-- The behavior here is needed during canonicalization; see Note [FunTy and
-- decomposing tycon applications] in TcCanonical for details.
diff --git a/compiler/types/TyCon.hs b/compiler/types/TyCon.hs
index 8f1082d07d..b80c600778 100644
--- a/compiler/types/TyCon.hs
+++ b/compiler/types/TyCon.hs
@@ -1732,7 +1732,7 @@ isInjectiveTyCon tc@(TcTyCon {}) _
isGenerativeTyCon :: TyCon -> Role -> Bool
isGenerativeTyCon (FamilyTyCon { famTcFlav = DataFamilyTyCon _ }) Nominal = True
isGenerativeTyCon (FamilyTyCon {}) _ = False
- -- in all other cases, injectivity implies generativitiy
+ -- in all other cases, injectivity implies generativity
isGenerativeTyCon tc r = isInjectiveTyCon tc r
-- | Is this an 'AlgTyConRhs' of a 'TyCon' that is generative and injective
diff --git a/compiler/types/Unify.hs b/compiler/types/Unify.hs
index 41b8c6138d..7c6409f7af 100644
--- a/compiler/types/Unify.hs
+++ b/compiler/types/Unify.hs
@@ -504,7 +504,7 @@ To make it idempotent we don't want to get just
We also want to substitute inside f's kind, to get
[ k -> *
, g -> H k (f:*) ]
-If we don't do this, we may apply the substitition to something,
+If we don't do this, we may apply the substitution to something,
and get an ill-formed type, i.e. one where typeKind will fail.
This happened, for example, in Trac #9106.
diff --git a/docs/users_guide/ghci.rst b/docs/users_guide/ghci.rst
index 04864cda83..d7f6b4b0eb 100644
--- a/docs/users_guide/ghci.rst
+++ b/docs/users_guide/ghci.rst
@@ -2153,7 +2153,7 @@ commonly used commands.
If omitted, ⟨n⟩ and ⟨m⟩ default to the first or last available
completion candidate respectively. If there are less candidates than
requested via the range argument, ⟨n⟩ and ⟨m⟩ are implicitly capped
- to the number of available completition candidates.
+ to the number of available completion candidates.
The output of :ghci-cmd:`:complete` begins with a header line containing
three space-delimited fields:
diff --git a/testsuite/tests/indexed-types/should_fail/T4485.hs b/testsuite/tests/indexed-types/should_fail/T4485.hs
index afea7e6c41..c3407cc0d3 100644
--- a/testsuite/tests/indexed-types/should_fail/T4485.hs
+++ b/testsuite/tests/indexed-types/should_fail/T4485.hs
@@ -48,7 +48,7 @@ data FooBar = FooBar
instance {-# OVERLAPPING #-} EmbedAsChild (IdentityT IO) FooBar where
asChild b = asChild $ (genElement "foo")
- -- asChild :: FooBar -> XMLGenT (XMLGenT (IdentityT IO) [Child (IdentitiyT IO)])
+ -- asChild :: FooBar -> XMLGenT (XMLGenT (IdentityT IO) [Child (IdentityT IO)])
{- ---------- Deriving the constraints ----------
asChild :: EmbedAsChild m c => c -> XMLGenT m [Child m]
diff --git a/testsuite/tests/programs/andy_cherry/andy_cherry.stdout b/testsuite/tests/programs/andy_cherry/andy_cherry.stdout
index 95c2aed7ad..8cb61fe7b3 100644
--- a/testsuite/tests/programs/andy_cherry/andy_cherry.stdout
+++ b/testsuite/tests/programs/andy_cherry/andy_cherry.stdout
@@ -7153,7 +7153,7 @@ $$\showboard$$
18 & \ldots & N*g2??\\
\end{tabular}}|
\end{center}
-Throws away a piece for a very temp. inititive.
+Throws away a piece for a very temp. initiative.
|18\ldots~Rb8; 19.~d4, e*d4; 20.~c*d4, Ne6; 21.~N*e6, Q*e6|
and white is starting to push home his advantage.
\begin{center}|
diff --git a/testsuite/tests/programs/andy_cherry/mygames.pgn b/testsuite/tests/programs/andy_cherry/mygames.pgn
index 1092cceca9..742e03bbc9 100644
--- a/testsuite/tests/programs/andy_cherry/mygames.pgn
+++ b/testsuite/tests/programs/andy_cherry/mygames.pgn
@@ -1307,7 +1307,7 @@ Qd6 15. h3 Be6 16. Ng5 Bxb3 17. axb3 Nf4 18. Nf3 {<sab>}) 15. Nxc5 Qc8 (
16. b4 {White is just a pawn up.}) 16... Rd8 17. Qd2 Rd6 (17... Bxf3 {!}
18. Rxf3 Qg4 19. Rxf4 exf4 20. h3 Qh4 21. d4 {and black has equalised!})
18. Bd1 {} 18... Nxg2 {?? Throws away a piece for a very temp.
-inititive.} (18... Rb8 19. d4 exd4 20. cxd4 Ne6 21. Nxe6 Qxe6 {and white
+initiative.} (18... Rb8 19. d4 exd4 20. cxd4 Ne6 21. Nxe6 Qxe6 {and white
is starting to push home his advantage.}) 19. Kxg2 Bh3+ 20. Kh1 Qg4 (
20... Rg6 {is another idea, but the whole plan is conceptually flawed.})
21. Ne1 Qg5 22. Qe2 Be6 23. Rg3 Qf6 24. Nxe6 {} (24. Nf3 Ne7 25. Nxe6