Commit 2515686f authored by Gabor Greif's avatar Gabor Greif 💬

catch some recent typos

parent 8688f6a5
...@@ -436,7 +436,7 @@ Cons: ...@@ -436,7 +436,7 @@ Cons:
Currently for GHC, the foreign call point is moot, because we do our 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 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 (this is slightly naughty, because we're making assumptions about the
C calling convention rather early on in the compiler). However, given C calling convention rather early on in the compiler). However, given
this, the cons outweigh the pros. this, the cons outweigh the pros.
......
...@@ -74,7 +74,7 @@ See #7730, #8776 for details -} ...@@ -74,7 +74,7 @@ See #7730, #8776 for details -}
-------------------- --------------------
-- | Pretty-prints a 'FamInst' (type/data family instance) with its defining location. -- | Pretty-prints a 'FamInst' (type/data family instance) with its defining location.
pprFamInst :: FamInst -> SDoc 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 -- because there is already much cleverness associated with printing
-- data type declarations that I don't want to duplicate -- data type declarations that I don't want to duplicate
-- * For type instances we print directly here; there is no TyCon -- * For type instances we print directly here; there is no TyCon
......
...@@ -37,7 +37,7 @@ such that ...@@ -37,7 +37,7 @@ such that
(WF2) if (a -f-> t) is in S, then t /= a (WF2) if (a -f-> t) is in S, then t /= a
Definition: applying a generalised substitution. 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 S(f,a) = t, if (a -fs-> t) in S, and fs >= f
= a, otherwise = a, otherwise
Application extends naturally to types S(f,t) Application extends naturally to types S(f,t)
...@@ -62,7 +62,7 @@ A generalised substitution S is "inert" iff ...@@ -62,7 +62,7 @@ A generalised substitution S is "inert" iff
---------------------------------------------------------------- ----------------------------------------------------------------
Our main invariant: 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 Note that inertness is not the same as idempotence. To apply S to a
...@@ -100,7 +100,7 @@ The idea is that ...@@ -100,7 +100,7 @@ The idea is that
not satisfy (K1-3), then we remove it from S by "kicking it out", not satisfy (K1-3), then we remove it from S by "kicking it out",
and re-processing it. 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. 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 * Assume we have G>=G, G>=W, D>=D, and that's all. Then, when performing
......
...@@ -815,7 +815,7 @@ canEqTyVarTyVar ev swapped tv1 tv2 co2 ...@@ -815,7 +815,7 @@ canEqTyVarTyVar ev swapped tv1 tv2 co2
-- So tv1 is not a meta tyvar -- So tv1 is not a meta tyvar
-- If only one is a meta tyvar, put it on the left -- 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 -- the floating step looks for meta tyvars on the left
| isMetaTyVar tv2 = True | isMetaTyVar tv2 = True
......
...@@ -557,7 +557,7 @@ deriveAutoTypeable auto_typeable done_specs tycl_decls ...@@ -557,7 +557,7 @@ deriveAutoTypeable auto_typeable done_specs tycl_decls
| spec <- done_specs | spec <- done_specs
, className (earlyDSClass spec) == typeableClassName ] , className (earlyDSClass spec) == typeableClassName ]
-- Check if an automatically generated DS for deriving Typeable should be -- 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_one cls (L _ decl)
= do { tc <- tcLookupTyCon (tcdName decl) = do { tc <- tcLookupTyCon (tcdName decl)
......
...@@ -1467,7 +1467,7 @@ relevantBindings want_filtering ctxt ct ...@@ -1467,7 +1467,7 @@ relevantBindings want_filtering ctxt ct
ct_tvs = tyVarsOfCt ct `unionVarSet` extra_tvs ct_tvs = tyVarsOfCt ct `unionVarSet` extra_tvs
-- For *kind* errors, report the relevant bindings of the -- 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 extra_tvs = case ctLocOrigin loc of
KindEqOrigin t1 t2 _ -> tyVarsOfTypes [t1,t2] KindEqOrigin t1 t2 _ -> tyVarsOfTypes [t1,t2]
_ -> emptyVarSet _ -> emptyVarSet
......
...@@ -2316,7 +2316,7 @@ We often want to make a top-level auxiliary binding. E.g. for comparison we hae ...@@ -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 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 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.) (See Trac #7947.)
So we use the *unique* from the parent name (T in this example) as part of the So we use the *unique* from the parent name (T in this example) as part of the
......
...@@ -968,7 +968,7 @@ kick_out new_ev new_tv (IC { inert_eqs = tv_eqs ...@@ -968,7 +968,7 @@ kick_out new_ev new_tv (IC { inert_eqs = tv_eqs
-- NB: Notice that don't rewrite -- NB: Notice that don't rewrite
-- inert_solved_dicts, and inert_solved_funeqs -- inert_solved_dicts, and inert_solved_funeqs
-- optimistically. But when we lookup we have to -- 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_cans_in = IC { inert_eqs = tv_eqs_in
, inert_dicts = dicts_in , inert_dicts = dicts_in
, inert_funeqs = feqs_in , inert_funeqs = feqs_in
...@@ -2270,7 +2270,7 @@ instance would fail: ...@@ -2270,7 +2270,7 @@ instance would fail:
But MkT was in scope, *and* if we used it before decomposing on T, But MkT was in scope, *and* if we used it before decomposing on T,
we'd unwrap the newtype (on both sides) to get we'd unwrap the newtype (on both sides) to get
Coercible Bool (F Int) Coercible Bool (F Int)
whic succeeds. which succeeds.
So our current decision is to apply case 3 (newtype-unwrapping) first, So our current decision is to apply case 3 (newtype-unwrapping) first,
followed by decomposition (case 4). This is strictly more powerful followed by decomposition (case 4). This is strictly more powerful
......
...@@ -1274,7 +1274,7 @@ Here we need to instantiate 'error' with a polytype. ...@@ -1274,7 +1274,7 @@ Here we need to instantiate 'error' with a polytype.
But 'error' has an OpenTypeKind type variable, precisely so that But 'error' has an OpenTypeKind type variable, precisely so that
we can instantiate it with Int#. So we also allow such type variables 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. straightforward.
************************************************************************ ************************************************************************
......
...@@ -161,7 +161,7 @@ data (~) a b = Eq# ((~#) a b) ...@@ -161,7 +161,7 @@ data (~) a b = Eq# ((~#) a b)
-- --
-- /Since: 4.7.0.0/ -- /Since: 4.7.0.0/
data Coercible a b = MkCoercible ((~#) a b) 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#, -- but * we don't yet have syntax for ~R#,
-- * the compiled code is the same either way -- * the compiled code is the same either way
-- * TysWiredIn has the truthful types -- * TysWiredIn has the truthful types
......
...@@ -405,7 +405,7 @@ test('T5321Fun', ...@@ -405,7 +405,7 @@ test('T5321Fun',
# 15/05/2013: 628341952 # (reason for decrease unknown) # 15/05/2013: 628341952 # (reason for decrease unknown)
# 24/06/2013: 694019152 # (reason for re-increase unknown) # 24/06/2013: 694019152 # (reason for re-increase unknown)
# 12/05/2014: 614409344 # (specialisation and inlining changes) # 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 # 06/11/2014: 541287000 # Simon's flat-skol changes to the constraint solver
], ],
compile,['']) compile,[''])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment