diff options
| -rw-r--r-- | compiler/GHC/Hs/Expr.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/StgToCmm/Expr.hs | 2 | ||||
| -rw-r--r-- | compiler/cmm/CmmImplementSwitchPlans.hs | 2 | ||||
| -rw-r--r-- | compiler/cmm/cmm-notes | 2 | ||||
| -rw-r--r-- | compiler/deSugar/DsMeta.hs | 4 | ||||
| -rw-r--r-- | compiler/prelude/TysWiredIn.hs | 2 | ||||
| -rw-r--r-- | compiler/typecheck/TcMType.hs | 2 | ||||
| -rw-r--r-- | compiler/types/TyCon.hs | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/compiler/GHC/Hs/Expr.hs b/compiler/GHC/Hs/Expr.hs index 847ecd1743..72b758ee5e 100644 --- a/compiler/GHC/Hs/Expr.hs +++ b/compiler/GHC/Hs/Expr.hs @@ -1455,7 +1455,7 @@ patterns in each equation. -} data MatchGroup p body - = MG { mg_ext :: XMG p body -- Posr typechecker, types of args and result + = MG { mg_ext :: XMG p body -- Post-typechecker, types of args and result , mg_alts :: Located [LMatch p body] -- The alternatives , mg_origin :: Origin } -- The type is the type of the entire group diff --git a/compiler/GHC/StgToCmm/Expr.hs b/compiler/GHC/StgToCmm/Expr.hs index 8645532472..51058c6186 100644 --- a/compiler/GHC/StgToCmm/Expr.hs +++ b/compiler/GHC/StgToCmm/Expr.hs @@ -414,7 +414,7 @@ cgCase (StgApp v []) _ (PrimAlt _) alts Consider case (x :: HValue) |> co of (y :: MutVar# Int) DEFAULT -> ... -We want to gnerate an assignment +We want to generate an assignment y := x We want to allow this assignment to be generated in the case when the types are compatible, because this allows some slightly-dodgy but diff --git a/compiler/cmm/CmmImplementSwitchPlans.hs b/compiler/cmm/CmmImplementSwitchPlans.hs index 84ff007bef..83c29cf6b5 100644 --- a/compiler/cmm/CmmImplementSwitchPlans.hs +++ b/compiler/cmm/CmmImplementSwitchPlans.hs @@ -67,7 +67,7 @@ visitSwitches dflags block -- This is important as the expression could contain expensive code like -- memory loads or divisions which we REALLY don't want to duplicate. --- This happend in parts of the handwritten RTS Cmm code. See also #16933 +-- This happened in parts of the handwritten RTS Cmm code. See also #16933 -- See Note [Floating switch expressions] floatSwitchExpr :: DynFlags -> CmmExpr -> UniqSM (Block CmmNode O O, CmmExpr) diff --git a/compiler/cmm/cmm-notes b/compiler/cmm/cmm-notes index 600a62a617..82d9673162 100644 --- a/compiler/cmm/cmm-notes +++ b/compiler/cmm/cmm-notes @@ -138,7 +138,7 @@ a dominator analysis, using the Dataflow Engine. * The CLabel for the entry-point/closure reveals whether g is
a CAF (or refers to CAFs). See the IdLabel constructor of CLabel.
-* The CAF-ness of the original top-level defininions is figured out
+* The CAF-ness of the original top-level definitions is figured out
(by TidyPgm) before we generate C--. This CafInfo is only set for
top-level Ids; nested bindings stay with MayHaveCafRefs.
diff --git a/compiler/deSugar/DsMeta.hs b/compiler/deSugar/DsMeta.hs index 6d7f281752..5290d1a978 100644 --- a/compiler/deSugar/DsMeta.hs +++ b/compiler/deSugar/DsMeta.hs @@ -1790,7 +1790,7 @@ repLambda (dL->L _ (Match { m_pats = ps do { xs <- repLPs ps; body <- repLE e; repLam xs body }) ; wrapGenSyms ss lam } -repLambda (dL->L _ m) = notHandled "Guarded labmdas" (pprMatch m) +repLambda (dL->L _ m) = notHandled "Guarded lambdas" (pprMatch m) ----------------------------------------------------------------------------- @@ -2117,7 +2117,7 @@ repMultiIf (MkC alts) = rep2 multiIfEName [alts] repLetE :: Core [TH.DecQ] -> Core TH.ExpQ -> DsM (Core TH.ExpQ) repLetE (MkC ds) (MkC e) = rep2 letEName [ds, e] -repCaseE :: Core TH.ExpQ -> Core [TH.MatchQ] -> DsM( Core TH.ExpQ) +repCaseE :: Core TH.ExpQ -> Core [TH.MatchQ] -> DsM (Core TH.ExpQ) repCaseE (MkC e) (MkC ms) = rep2 caseEName [e, ms] repDoE :: Core [TH.StmtQ] -> DsM (Core TH.ExpQ) diff --git a/compiler/prelude/TysWiredIn.hs b/compiler/prelude/TysWiredIn.hs index 74556b5323..b1ba7bf4b2 100644 --- a/compiler/prelude/TysWiredIn.hs +++ b/compiler/prelude/TysWiredIn.hs @@ -208,7 +208,7 @@ names in PrelNames, so they use wTcQual, wDataQual, etc -- See also Note [Known-key names] wiredInTyCons :: [TyCon] -wiredInTyCons = [ -- Units are not treated like other tuples, because then +wiredInTyCons = [ -- Units are not treated like other tuples, because they -- are defined in GHC.Base, and there's only a few of them. We -- put them in wiredInTyCons so that they will pre-populate -- the name cache, so the parser in isBuiltInOcc_maybe doesn't diff --git a/compiler/typecheck/TcMType.hs b/compiler/typecheck/TcMType.hs index bb6f2b4dc2..0ac553c0ea 100644 --- a/compiler/typecheck/TcMType.hs +++ b/compiler/typecheck/TcMType.hs @@ -1790,7 +1790,7 @@ For example, when we see a call `reverse (f xs)`, we know that we calling reverse :: forall a. [a] -> [a] So we know that the argument `f xs` must be a "list of something". But what is the "something"? We don't know until we explore the `f xs` a bit more. So we set -out what we do know at the call of `reverse` by instantiate its type with a fresh +out what we do know at the call of `reverse` by instantiating its type with a fresh meta tyvar, `alpha` say. So now the type of the argument `f xs`, and of the result, is `[alpha]`. The unification variable `alpha` stands for the as-yet-unknown type of the elements of the list. diff --git a/compiler/types/TyCon.hs b/compiler/types/TyCon.hs index 31bfddce81..7166f85c02 100644 --- a/compiler/types/TyCon.hs +++ b/compiler/types/TyCon.hs @@ -2214,7 +2214,7 @@ isLiftedTypeKindTyConName = (`hasKey` liftedTypeKindTyConKey) -- (similar to a @dfun@ does that for a class instance). -- -- * Tuples are implicit iff they have a wired-in name --- (namely: boxed and unboxed tupeles are wired-in and implicit, +-- (namely: boxed and unboxed tuples are wired-in and implicit, -- but constraint tuples are not) isImplicitTyCon :: TyCon -> Bool isImplicitTyCon (FunTyCon {}) = True |