diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/coreSyn/CoreSyn.hs | 2 | ||||
| -rw-r--r-- | compiler/coreSyn/CoreUnfold.hs | 2 | ||||
| -rw-r--r-- | compiler/coreSyn/CoreUtils.hs | 2 | ||||
| -rw-r--r-- | compiler/ghci/ByteCodeGen.hs | 8 | ||||
| -rw-r--r-- | compiler/simplCore/SimplCore.hs | 2 | ||||
| -rw-r--r-- | compiler/simplCore/Simplify.hs | 2 | ||||
| -rw-r--r-- | compiler/specialise/Rules.hs | 2 | ||||
| -rw-r--r-- | compiler/typecheck/TcCanonical.hs | 2 | ||||
| -rw-r--r-- | compiler/typecheck/TcInstDcls.hs | 2 | ||||
| -rw-r--r-- | compiler/typecheck/TcSMonad.hs | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/compiler/coreSyn/CoreSyn.hs b/compiler/coreSyn/CoreSyn.hs index 13cf8ae5fb..99478d2b66 100644 --- a/compiler/coreSyn/CoreSyn.hs +++ b/compiler/coreSyn/CoreSyn.hs @@ -1652,7 +1652,7 @@ In unfoldings and rules, we guarantee that the template is occ-analysed, so that the occurrence info on the binders is correct. This is important, because the Simplifier does not re-analyse the template when using it. If the occurrence info is wrong - - We may get more simpifier iterations than necessary, because + - We may get more simplifier iterations than necessary, because once-occ info isn't there - More seriously, we may get an infinite loop if there's a Rec without a loop breaker marked diff --git a/compiler/coreSyn/CoreUnfold.hs b/compiler/coreSyn/CoreUnfold.hs index cedc78fcfa..a104cd693f 100644 --- a/compiler/coreSyn/CoreUnfold.hs +++ b/compiler/coreSyn/CoreUnfold.hs @@ -649,7 +649,7 @@ sizeExpr dflags bOMB_OUT_SIZE top_args expr -- Don't charge for args, so that wrappers look cheap -- (See comments about wrappers with Case) -- - -- IMPORATANT: *do* charge 1 for the alternative, else we + -- IMPORTANT: *do* charge 1 for the alternative, else we -- find that giant case nests are treated as practically free -- A good example is Foreign.C.Error.errnoToIOError diff --git a/compiler/coreSyn/CoreUtils.hs b/compiler/coreSyn/CoreUtils.hs index b8399237da..eec524f86d 100644 --- a/compiler/coreSyn/CoreUtils.hs +++ b/compiler/coreSyn/CoreUtils.hs @@ -713,7 +713,7 @@ This gave rise to a horrible sequence of cases and similarly in cascade for all the join points! NB: it's important that all this is done in [InAlt], *before* we work -on the alternatives themselves, because Simpify.simplAlt may zap the +on the alternatives themselves, because Simplify.simplAlt may zap the occurrence info on the binders in the alternatives, which in turn defeats combineIdenticalAlts (see Trac #7360). diff --git a/compiler/ghci/ByteCodeGen.hs b/compiler/ghci/ByteCodeGen.hs index 5c236f3dab..2695a98f9e 100644 --- a/compiler/ghci/ByteCodeGen.hs +++ b/compiler/ghci/ByteCodeGen.hs @@ -409,14 +409,14 @@ getVarOffSets depth env = catMaybes . map getOffSet Nothing -> Nothing Just offset -> -- michalt: I'm not entirely sure why we need the stack - -- adjustement by 2 here. I initially thought that there's + -- adjustment by 2 here. I initially thought that there's -- something off with getIdValFromApStack (the only user of this -- value), but it looks ok to me. My current hypothesis is that - -- this "adjustement" is needed due to stack manipulation for + -- this "adjustment" is needed due to stack manipulation for -- BRK_FUN in Interpreter.c In any case, this is used only when -- we trigger a breakpoint. - let adjustement = 2 - in Just (id, trunc16 $ depth - offset + adjustement) + let adjustment = 2 + in Just (id, trunc16 $ depth - offset + adjustment) trunc16 :: Word -> Word16 trunc16 w diff --git a/compiler/simplCore/SimplCore.hs b/compiler/simplCore/SimplCore.hs index 93d829283e..c1513b8af6 100644 --- a/compiler/simplCore/SimplCore.hs +++ b/compiler/simplCore/SimplCore.hs @@ -284,7 +284,7 @@ getCoreToDo dflags -- At least 3 iterations because otherwise we land up with -- huge dead expressions because of an infelicity in the - -- simpifier. + -- simplifier. -- let k = BIG in foldr k z xs -- ==> let k = BIG in letrec go = \xs -> ...(k x).... in go xs -- ==> let k = BIG in letrec go = \xs -> ...(BIG x).... in go xs diff --git a/compiler/simplCore/Simplify.hs b/compiler/simplCore/Simplify.hs index 8bccbfef54..91ed644057 100644 --- a/compiler/simplCore/Simplify.hs +++ b/compiler/simplCore/Simplify.hs @@ -1865,7 +1865,7 @@ latter's strictness when simplifying e2, e3. Moreover, suppose we have Then given (f Int e1) we rewrite to (\x. x True) e1 -without simpifying e1. Now we can inline x into its unique call site, +without simplifying e1. Now we can inline x into its unique call site, and absorb the True into it all in the same pass. If we simplified e1 first, we couldn't do that; see Note [Avoiding exponential behaviour]. diff --git a/compiler/specialise/Rules.hs b/compiler/specialise/Rules.hs index aed86c5b42..b5606754e6 100644 --- a/compiler/specialise/Rules.hs +++ b/compiler/specialise/Rules.hs @@ -617,7 +617,7 @@ bound on the LHS: RULE forall (c :: a~b). f (x |> c) = e Now, if that binding is inlined, so that a=b=Int, we'd get RULE forall (c :: Int~Int). f (x |> c) = e - and now when we simpilfy the LHS (Simplify.simplRule) we + and now when we simplify the LHS (Simplify.simplRule) we optCoercion will turn that 'c' into Refl: RULE forall (c :: Int~Int). f (x |> <Int>) = e and then perhaps drop it altogether. Now 'c' is unbound. diff --git a/compiler/typecheck/TcCanonical.hs b/compiler/typecheck/TcCanonical.hs index d373ee908e..be51914a27 100644 --- a/compiler/typecheck/TcCanonical.hs +++ b/compiler/typecheck/TcCanonical.hs @@ -126,7 +126,7 @@ canEvNC ev canClassNC :: CtEvidence -> Class -> [Type] -> TcS (StopOrContinue Ct) -- "NC" means "non-canonical"; that is, we have got here --- from a NonCanonical constrataint, not from a CDictCan +-- from a NonCanonical constraint, not from a CDictCan -- Precondition: EvVar is class evidence canClassNC ev cls tys | isGiven ev -- See Note [Eagerly expand given superclasses] diff --git a/compiler/typecheck/TcInstDcls.hs b/compiler/typecheck/TcInstDcls.hs index 6f3a2c9163..022668b470 100644 --- a/compiler/typecheck/TcInstDcls.hs +++ b/compiler/typecheck/TcInstDcls.hs @@ -954,7 +954,7 @@ Notice that by checkInstConstraints. * Overall instance implication. There is an overall enclosing - implication for the whole instance declaratation, with the expected + implication for the whole instance declaration, with the expected skolems and givens. We need this to get the correct "redundant constraint" warnings, gathering all the uses from all the methods and superclasses. See TcSimplify Note [Tracking redundant diff --git a/compiler/typecheck/TcSMonad.hs b/compiler/typecheck/TcSMonad.hs index bb4f55788f..b5f6554766 100644 --- a/compiler/typecheck/TcSMonad.hs +++ b/compiler/typecheck/TcSMonad.hs @@ -1842,7 +1842,7 @@ getNoGivenEqs tclvl skol_tvs eqs_given_here _ = False ev_given_here :: CtEvidence -> Bool - -- True for a Given bound by the curent implication, + -- True for a Given bound by the current implication, -- i.e. the current level ev_given_here ev = isGiven ev |