diff options
author | Gabor Greif <ggreif@gmail.com> | 2016-11-14 17:57:09 +0100 |
---|---|---|
committer | Gabor Greif <ggreif@gmail.com> | 2016-11-15 16:11:23 +0100 |
commit | 017d11e0a36866b05ace32ece1af11adf652a619 (patch) | |
tree | 234e1bdb64dec938ec909898ad6ebf001ec10788 | |
parent | 642adec4da8df4ae39b884b30c47284a3c9d0f30 (diff) | |
download | haskell-017d11e0a36866b05ace32ece1af11adf652a619.tar.gz |
Typos in comments, notes and manual
-rw-r--r-- | compiler/coreSyn/CoreUtils.hs | 2 | ||||
-rw-r--r-- | compiler/typecheck/TcExpr.hs | 4 | ||||
-rw-r--r-- | compiler/typecheck/TcFlatten.hs | 2 | ||||
-rw-r--r-- | compiler/typecheck/TcGenDeriv.hs | 2 | ||||
-rw-r--r-- | compiler/typecheck/TcInstDcls.hs | 2 | ||||
-rw-r--r-- | compiler/typecheck/TcMType.hs | 2 | ||||
-rw-r--r-- | compiler/typecheck/TcSimplify.hs | 4 | ||||
-rw-r--r-- | compiler/typecheck/TcUnify.hs | 2 | ||||
-rw-r--r-- | compiler/vectorise/Vectorise.hs | 2 | ||||
-rw-r--r-- | docs/users_guide/glasgow_exts.rst | 6 | ||||
-rw-r--r-- | testsuite/tests/typecheck/should_fail/tcfail174.hs | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/compiler/coreSyn/CoreUtils.hs b/compiler/coreSyn/CoreUtils.hs index a1287379e4..ef1555f58b 100644 --- a/compiler/coreSyn/CoreUtils.hs +++ b/compiler/coreSyn/CoreUtils.hs @@ -2091,7 +2091,7 @@ rhsIsStatic :: Platform -- -- (ii) We treat partial applications as redexes, because in fact we -- make a thunk for them that runs and builds a PAP --- at run-time. The only appliations that are treated as +-- at run-time. The only applications that are treated as -- static are *saturated* applications of constructors. -- We used to try to be clever with nested structures like this: diff --git a/compiler/typecheck/TcExpr.hs b/compiler/typecheck/TcExpr.hs index 2632fd19fe..4c7417fa21 100644 --- a/compiler/typecheck/TcExpr.hs +++ b/compiler/typecheck/TcExpr.hs @@ -306,7 +306,7 @@ People write so much, where runST :: (forall s. ST s a) -> a that I have finally given in and written a special type-checking -rule just for saturated appliations of ($). +rule just for saturated applications of ($). * Infer the type of the first argument * Decompose it; should be of form (arg2_ty -> res_ty), where arg2_ty might be a polytype @@ -1938,7 +1938,7 @@ getFixedTyVars upd_fld_occs univ_tvs cons -- Universally-quantified tyvars that -- appear in any of the *implicit* -- arguments to the constructor are fixed - -- See Note [Implict type sharing] + -- See Note [Implicit type sharing] fixed_tys = [ty | (fl, ty) <- zip flds arg_tys , not (flLabel fl `elem` upd_fld_occs)] diff --git a/compiler/typecheck/TcFlatten.hs b/compiler/typecheck/TcFlatten.hs index 24a335831c..6987191443 100644 --- a/compiler/typecheck/TcFlatten.hs +++ b/compiler/typecheck/TcFlatten.hs @@ -432,7 +432,7 @@ Assuming NOT rewriting wanteds with wanteds [G] V a ~ f_aBg Worklist includes [W] Scalar fmv_aBi ~ fmv_aBk - fmv_aBi, fmv_aBk are flatten unificaiton variables + fmv_aBi, fmv_aBk are flatten unification variables Work item: [W] V fsk_aBh ~ fmv_aBi diff --git a/compiler/typecheck/TcGenDeriv.hs b/compiler/typecheck/TcGenDeriv.hs index 50e4c54d50..672f4b3660 100644 --- a/compiler/typecheck/TcGenDeriv.hs +++ b/compiler/typecheck/TcGenDeriv.hs @@ -1591,7 +1591,7 @@ a polytype. E.g. The type checker checks this code, and it currently requires -XImpredicativeTypes to permit that polymorphic type instantiation, -so ew have to switch that flag on locally in TcDeriv.genInst. +so we have to switch that flag on locally in TcDeriv.genInst. See #8503 for more discussion. diff --git a/compiler/typecheck/TcInstDcls.hs b/compiler/typecheck/TcInstDcls.hs index aa97075449..1a46a0ac08 100644 --- a/compiler/typecheck/TcInstDcls.hs +++ b/compiler/typecheck/TcInstDcls.hs @@ -941,7 +941,7 @@ Notice that be usused in some, but dead-code elimination will drop it.) We achieve this by putting the the evidence variable for the overall - instance implicaiton into the AbsBinds for each method/superclass. + instance implication into the AbsBinds for each method/superclass. Hence the 'dfun_ev_binds' passed into tcMethods and tcSuperClasses. (And that in turn is why the abs_ev_binds field of AbBinds is a [TcEvBinds] rather than simply TcEvBinds. diff --git a/compiler/typecheck/TcMType.hs b/compiler/typecheck/TcMType.hs index af87483a6d..ff0ee9ea49 100644 --- a/compiler/typecheck/TcMType.hs +++ b/compiler/typecheck/TcMType.hs @@ -379,7 +379,7 @@ checkingExpType err et = pprPanic "checkingExpType" (text err $$ ppr et) tauifyExpType :: ExpType -> TcM ExpType -- ^ Turn a (Infer hole) type into a (Check alpha), --- where alpha is a fresh unificaiton variable +-- where alpha is a fresh unification variable tauifyExpType (Check ty) = return (Check ty) -- No-op for (Check ty) tauifyExpType (Infer inf_res) = do { ty <- inferResultToType inf_res ; return (Check ty) } diff --git a/compiler/typecheck/TcSimplify.hs b/compiler/typecheck/TcSimplify.hs index 05943136f0..c23b3171ab 100644 --- a/compiler/typecheck/TcSimplify.hs +++ b/compiler/typecheck/TcSimplify.hs @@ -1553,8 +1553,8 @@ of progress. Trac #8474 is a classic example: exponentially many) iterations! Conclusion: we should call solveNestedImplications only if we did -some unifiction in solveSimpleWanteds; because that's the only way -we'll get more Givens (a unificaiton is like adding a Given) to +some unification in solveSimpleWanteds; because that's the only way +we'll get more Givens (a unification is like adding a Given) to allow the implication to make progress. -} diff --git a/compiler/typecheck/TcUnify.hs b/compiler/typecheck/TcUnify.hs index f073c7b0f7..d194321fe4 100644 --- a/compiler/typecheck/TcUnify.hs +++ b/compiler/typecheck/TcUnify.hs @@ -999,7 +999,7 @@ with constraints Here we abstract over the '->' inside the forall, in case that is subject to an equality constraint from a GADT match. -Note that we kept the outer (->) becuase that's part of +Note that we kept the outer (->) because that's part of the polymorphic "shape". And becauuse of impredicativity, GADT matches can't give equalities that affect polymorphic shape. diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index b78db7c6da..70ea2e42b9 100644 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs @@ -275,7 +275,7 @@ vectTopBind b@(Rec binds) -- Add a vectorised binding to an imported top-level variable that has a VECTORISE pragma -- in this module. -- --- RESTIRCTION: Currently, we cannot use the pragma for mutually recursive definitions. +-- RESTRICTION: Currently, we cannot use the pragma for mutually recursive definitions. -- vectImpBind :: (Id, CoreExpr) -> VM CoreBind vectImpBind (var, expr) diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst index 9cda16a970..af5879243e 100644 --- a/docs/users_guide/glasgow_exts.rst +++ b/docs/users_guide/glasgow_exts.rst @@ -9493,13 +9493,13 @@ your ``forall``\s explicitly. Indeed, doing so is strongly advised for rank-2 types. Sometimes there *is* no "outermost level", in which case no -implicit quanification happens: :: +implicit quantification happens: :: data PackMap a b s t = PackMap (Monad f => (a -> f b) -> s -> f t) This is rejected because there is no "outermost level" for the types on the RHS (it would obviously be terrible to add extra parameters to ``PackMap``), -so no implicit quantificaiton happens, and the declaration is rejected +so no implicit quantification happens, and the declaration is rejected (with "``f`` is out of scope"). Solution: use an explicit ``forall``: :: data PackMap a b s t = PackMap (forall f. Monad f => (a -> f b) -> s -> f t) @@ -11590,7 +11590,7 @@ optionally had by adding ``!`` in front of a variable. In ordinary Haskell, ``f`` is lazy in its argument and hence in ``x``; and ``g`` is strict in its argument and hence also strict in ``x``. With ``Strict``, both become strict because ``f``'s argument - gets an implict bang. + gets an implicit bang. .. _strict-modularity: diff --git a/testsuite/tests/typecheck/should_fail/tcfail174.hs b/testsuite/tests/typecheck/should_fail/tcfail174.hs index 85c5e1c961..c3328ea4e7 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail174.hs +++ b/testsuite/tests/typecheck/should_fail/tcfail174.hs @@ -8,7 +8,7 @@ data Capture a = Base a g :: Capture (forall a . a -> a) g = Base id -- Fails; need a rigid signature on 'id' -- Actually, succeeds now, with visible type application - -- Disagree: should not succeed becuase it instantiates + -- Disagree: should not succeed because it instantiates -- Base with a forall type -- This function should definitely be rejected, with or without type signature |