diff options
author | Gabor Greif <ggreif@gmail.com> | 2017-07-31 17:34:43 +0200 |
---|---|---|
committer | Gabor Greif <ggreif@gmail.com> | 2017-07-31 17:34:43 +0200 |
commit | 2ef973e823ffb128f9f3b4b85b219e1627dceabf (patch) | |
tree | bdc2ea93b92e8cb0d064486cba5581d87516e728 /compiler | |
parent | 4fdc523456ff6481df8d7483ae193f0c2dc2b3fe (diff) | |
download | haskell-2ef973e823ffb128f9f3b4b85b219e1627dceabf.tar.gz |
A bunch of typofixes
Diffstat (limited to 'compiler')
-rw-r--r-- | compiler/basicTypes/DataCon.hs | 2 | ||||
-rw-r--r-- | compiler/basicTypes/PatSyn.hs | 2 | ||||
-rw-r--r-- | compiler/nativeGen/RegAlloc/Graph/Coalesce.hs | 2 | ||||
-rw-r--r-- | compiler/prelude/PrelRules.hs | 2 | ||||
-rw-r--r-- | compiler/simplCore/CallArity.hs | 2 | ||||
-rw-r--r-- | compiler/simplCore/SimplUtils.hs | 2 | ||||
-rw-r--r-- | compiler/simplStg/StgCse.hs | 2 | ||||
-rw-r--r-- | compiler/typecheck/TcHsType.hs | 2 | ||||
-rw-r--r-- | compiler/typecheck/TcUnify.hs | 2 | ||||
-rw-r--r-- | compiler/typecheck/TcValidity.hs | 2 | ||||
-rw-r--r-- | compiler/types/TyCoRep.hs | 2 | ||||
-rw-r--r-- | compiler/types/TyCon.hs | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/compiler/basicTypes/DataCon.hs b/compiler/basicTypes/DataCon.hs index 73bbf2cf57..b8a1b04ce1 100644 --- a/compiler/basicTypes/DataCon.hs +++ b/compiler/basicTypes/DataCon.hs @@ -902,7 +902,7 @@ dataConExTyVars (MkData { dcExTyVars = tvbs }) = binderVars tvbs dataConExTyVarBinders :: DataCon -> [TyVarBinder] dataConExTyVarBinders = dcExTyVars --- | Both the universal and existentiatial type variables of the constructor +-- | Both the universal and existential type variables of the constructor dataConAllTyVars :: DataCon -> [TyVar] dataConAllTyVars (MkData { dcUnivTyVars = univ_tvs, dcExTyVars = ex_tvs }) = binderVars (univ_tvs ++ ex_tvs) diff --git a/compiler/basicTypes/PatSyn.hs b/compiler/basicTypes/PatSyn.hs index 176bb9f590..d59810b5e1 100644 --- a/compiler/basicTypes/PatSyn.hs +++ b/compiler/basicTypes/PatSyn.hs @@ -177,7 +177,7 @@ P's universal tyvars. You have to /match/ the type of the pattern, (T [ty] Bool) against the psResultTy for the pattern synonym, T [a] Bool -to get the insantiation a := ty. +to get the instantiation a := ty. This is very unlike DataCons, where univ tyvars match 1-1 the arguments of the TyCon. diff --git a/compiler/nativeGen/RegAlloc/Graph/Coalesce.hs b/compiler/nativeGen/RegAlloc/Graph/Coalesce.hs index 7e8047f29f..832df2334e 100644 --- a/compiler/nativeGen/RegAlloc/Graph/Coalesce.hs +++ b/compiler/nativeGen/RegAlloc/Graph/Coalesce.hs @@ -62,7 +62,7 @@ sinkReg fm r -- | Slurp out mov instructions that only serve to join live ranges. -- --- During a mov, if the source reg dies and the destiation reg is +-- During a mov, if the source reg dies and the destination reg is -- born then we can rename the two regs to the same thing and -- eliminate the move. slurpJoinMovs diff --git a/compiler/prelude/PrelRules.hs b/compiler/prelude/PrelRules.hs index 1ef0565ff3..2dbc5e888d 100644 --- a/compiler/prelude/PrelRules.hs +++ b/compiler/prelude/PrelRules.hs @@ -1517,7 +1517,7 @@ into 0# -> e1 1# -> e1 -This rule elimiantes a lot of boilerplate. For +This rule eliminates a lot of boilerplate. For if (x>y) then e1 else e2 we generate case tagToEnum (x ># y) of diff --git a/compiler/simplCore/CallArity.hs b/compiler/simplCore/CallArity.hs index 0cf0c2f44f..e41e5bdef9 100644 --- a/compiler/simplCore/CallArity.hs +++ b/compiler/simplCore/CallArity.hs @@ -350,7 +350,7 @@ Note [Thunks in recursive groups] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ We never eta-expand a thunk in a recursive group, on the grounds that if it is -part of a recursive group, then it will be called multipe times. +part of a recursive group, then it will be called multiple times. This is not necessarily true, e.g. it would be safe to eta-expand t2 (but not t1) in the following code: diff --git a/compiler/simplCore/SimplUtils.hs b/compiler/simplCore/SimplUtils.hs index e6e660b91f..b01955c8be 100644 --- a/compiler/simplCore/SimplUtils.hs +++ b/compiler/simplCore/SimplUtils.hs @@ -1785,7 +1785,7 @@ prepareAlts scrut case_bndr' alts mkCase tries these things * Note [Nerge nested cases] -* Note [Elimiante identity case] +* Note [Eliminate identity case] * Note [Scrutinee constant folding] Note [Merge Nested Cases] diff --git a/compiler/simplStg/StgCse.hs b/compiler/simplStg/StgCse.hs index f3e781b886..b221902768 100644 --- a/compiler/simplStg/StgCse.hs +++ b/compiler/simplStg/StgCse.hs @@ -16,7 +16,7 @@ note [Case 2: CSEing case binders] below. Note [Case 1: CSEing allocated closures] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The fist kind of CSE opportunity we aim for is generated by this Haskell code: +The first kind of CSE opportunity we aim for is generated by this Haskell code: bar :: a -> (Either Int a, Either Bool a) bar x = (Right x, Right x) diff --git a/compiler/typecheck/TcHsType.hs b/compiler/typecheck/TcHsType.hs index 7367c2063f..6e2720bdb7 100644 --- a/compiler/typecheck/TcHsType.hs +++ b/compiler/typecheck/TcHsType.hs @@ -1254,7 +1254,7 @@ Help functions for type applications addTypeCtxt :: LHsType GhcRn -> TcM a -> TcM a -- Wrap a context around only if we want to show that contexts. - -- Omit invisble ones and ones user's won't grok + -- Omit invisible ones and ones user's won't grok addTypeCtxt (L _ ty) thing = addErrCtxt doc thing where diff --git a/compiler/typecheck/TcUnify.hs b/compiler/typecheck/TcUnify.hs index 269f202d10..b792f955c4 100644 --- a/compiler/typecheck/TcUnify.hs +++ b/compiler/typecheck/TcUnify.hs @@ -389,7 +389,7 @@ matchExpectedTyConApp tc orig_ty -- kind-compatible with T. For example, suppose we have -- matchExpectedTyConApp T (f Maybe) -- where data T a = MkT a - -- Then we don't want to instantate T's data constructors with + -- Then we don't want to instantiate T's data constructors with -- (a::*) ~ Maybe -- because that'll make types that are utterly ill-kinded. -- This happened in Trac #7368 diff --git a/compiler/typecheck/TcValidity.hs b/compiler/typecheck/TcValidity.hs index 4c2b7b6a3d..cce19cd85c 100644 --- a/compiler/typecheck/TcValidity.hs +++ b/compiler/typecheck/TcValidity.hs @@ -1200,7 +1200,7 @@ It checks for three things might be applications thus (f (g x)). Note that tys only includes the visible arguments of the class type - constructor. Including the non-vivisble arguments can cause the following, + constructor. Including the non-visible arguments can cause the following, perfectly valid instance to be rejected: class Category (cat :: k -> k -> *) where ... newtype T (c :: * -> * -> *) a b = MkT (c a b) diff --git a/compiler/types/TyCoRep.hs b/compiler/types/TyCoRep.hs index c03c37c584..c8ea18af88 100644 --- a/compiler/types/TyCoRep.hs +++ b/compiler/types/TyCoRep.hs @@ -477,7 +477,7 @@ Note [TyVarBndrs, TyVarBinders, TyConBinders, and visiblity] This table summarises the visiblity rules: --------------------------------------------------------------------------------------- | Occurrences look like this -| GHC displays type as in Haskell souce code +| GHC displays type as in Haskell source code |----------------------------------------------------------------------- | TvBndr a tvis :: TyVarBinder, in the binder of ForAllTy for a term | tvis :: ArgFlag diff --git a/compiler/types/TyCon.hs b/compiler/types/TyCon.hs index 403fc42b50..cf144eb045 100644 --- a/compiler/types/TyCon.hs +++ b/compiler/types/TyCon.hs @@ -485,7 +485,7 @@ That is, its TyVarBinders should be , TvBndr (a:k->*) Specified , TvBndr (b:k) Specified ] -So tyConTyVarBinders conversts TyCon's TyConBinders into TyVarBinders: +So tyConTyVarBinders converts TyCon's TyConBinders into TyVarBinders: - variable names from the TyConBinders - but changing Anon/Required to Specified |