diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/basicTypes/OccName.hs | 2 | ||||
| -rw-r--r-- | compiler/nativeGen/BlockLayout.hs | 2 | ||||
| -rw-r--r-- | compiler/nativeGen/PPC/CodeGen.hs | 2 | ||||
| -rw-r--r-- | compiler/parser/Lexer.x | 2 | ||||
| -rw-r--r-- | compiler/parser/RdrHsSyn.hs | 2 | ||||
| -rw-r--r-- | compiler/prelude/PrelRules.hs | 2 | ||||
| -rw-r--r-- | compiler/rename/RnSource.hs | 2 | ||||
| -rw-r--r-- | compiler/specialise/Specialise.hs | 2 | ||||
| -rw-r--r-- | compiler/typecheck/TcGenDeriv.hs | 2 | ||||
| -rw-r--r-- | compiler/utils/Digraph.hs | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/compiler/basicTypes/OccName.hs b/compiler/basicTypes/OccName.hs index bbd40f85a5..fa259725cf 100644 --- a/compiler/basicTypes/OccName.hs +++ b/compiler/basicTypes/OccName.hs @@ -527,7 +527,7 @@ parenSymOcc occ doc | isSymOcc occ = parens doc | otherwise = doc startsWithUnderscore :: OccName -> Bool --- ^ Haskell 98 encourages compilers to suppress warnings about unsed +-- ^ Haskell 98 encourages compilers to suppress warnings about unused -- names in a pattern if they start with @_@: this implements that test startsWithUnderscore occ = headFS (occNameFS occ) == '_' diff --git a/compiler/nativeGen/BlockLayout.hs b/compiler/nativeGen/BlockLayout.hs index 45779d8089..ba15e0063f 100644 --- a/compiler/nativeGen/BlockLayout.hs +++ b/compiler/nativeGen/BlockLayout.hs @@ -76,7 +76,7 @@ import Control.Monad (foldM) We have a CFG with edge weights based on which we try to place blocks next to each other. - Edge weights not only represent likelyhood of control transfer between blocks + Edge weights not only represent likelihood of control transfer between blocks but also how much a block would benefit from being placed sequentially after it's predecessor. For example blocks which are preceded by an info table are more likely to end diff --git a/compiler/nativeGen/PPC/CodeGen.hs b/compiler/nativeGen/PPC/CodeGen.hs index ea663dcc23..11759fb1a5 100644 --- a/compiler/nativeGen/PPC/CodeGen.hs +++ b/compiler/nativeGen/PPC/CodeGen.hs @@ -602,7 +602,7 @@ getRegister' _ (CmmMachOp mop [x, y]) -- dyadic PrimOps _ -> case x of CmmLit (CmmInt imm _) | Just _ <- makeImmediate rep True imm - -- subfi ('substract from' with immediate) doesn't exist + -- subfi ('subtract from' with immediate) doesn't exist -> trivialCode rep True SUBFC y x _ -> trivialCodeNoImm' (intFormat rep) SUBF y x diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x index 160cb8c357..fc6779a359 100644 --- a/compiler/parser/Lexer.x +++ b/compiler/parser/Lexer.x @@ -558,7 +558,7 @@ $tab { warnTab } -- a! b -- a suffix occurrence -- -- The rules are a bit more elaborate than simply checking for whitespace, in --- order to accomodate the following use cases: +-- order to accommodate the following use cases: -- -- f (!a) = ... -- prefix occurrence -- g (a !) -- loose infix occurrence diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs index 001de80598..0ffad547a7 100644 --- a/compiler/parser/RdrHsSyn.hs +++ b/compiler/parser/RdrHsSyn.hs @@ -2428,7 +2428,7 @@ tagless final encoding, and there's no need for this complexity. {- Note [PatBuilder] ~~~~~~~~~~~~~~~~~~~~ -Unlike HsExpr or HsCmd, the Pat type cannot accomodate all intermediate forms, +Unlike HsExpr or HsCmd, the Pat type cannot accommodate all intermediate forms, so we introduce the notion of a PatBuilder. Consider a pattern like this: diff --git a/compiler/prelude/PrelRules.hs b/compiler/prelude/PrelRules.hs index 72d99a5b8e..bdcbecfe59 100644 --- a/compiler/prelude/PrelRules.hs +++ b/compiler/prelude/PrelRules.hs @@ -733,7 +733,7 @@ There are two cases: from the 'integer' library. These are handled by rule_shift_op, and match_Integer_shift_op. - Here we could in principle shift by any amount, but we arbitary + Here we could in principle shift by any amount, but we arbitrary limit the shift to 4 bits; in particular we do not want shift by a huge amount, which can happen in code like that above. diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs index 88fe10b493..a166a65bfb 100644 --- a/compiler/rename/RnSource.hs +++ b/compiler/rename/RnSource.hs @@ -1231,7 +1231,7 @@ Why do the instance declarations participate? At least two reasons the type synonym S. While we know that S depends upon 'Q depends upon Closed, we have no idea that Closed depends upon Open! - To accomodate for these situations, we ensure that an instance is checked + To accommodate for these situations, we ensure that an instance is checked before every @TyClDecl@ on which it does not depend. That's to say, instances are checked as early as possible in @tcTyAndClassDecls@. diff --git a/compiler/specialise/Specialise.hs b/compiler/specialise/Specialise.hs index 96c29f4f21..b79a559436 100644 --- a/compiler/specialise/Specialise.hs +++ b/compiler/specialise/Specialise.hs @@ -2378,7 +2378,7 @@ pair_fvs (bndr, rhs) = exprSomeFreeVars interesting rhs interesting :: InterestingVarFun interesting v = isLocalVar v || (isId v && isDFunId v) -- Very important: include DFunIds /even/ if it is imported - -- Reason: See Note [Avoiding loops], the second exmaple + -- Reason: See Note [Avoiding loops], the second example -- involving an imported dfun. We must know whether -- a dictionary binding depends on an imported dfun, -- in case we try to specialise that imported dfun diff --git a/compiler/typecheck/TcGenDeriv.hs b/compiler/typecheck/TcGenDeriv.hs index add22a6060..f7fbb02aa6 100644 --- a/compiler/typecheck/TcGenDeriv.hs +++ b/compiler/typecheck/TcGenDeriv.hs @@ -2369,7 +2369,7 @@ mkAuxBinderName dflags parent occ_fun {- Note [Auxiliary binders] ~~~~~~~~~~~~~~~~~~~~~~~~ -We often want to make a top-level auxiliary binding. E.g. for comparison we haev +We often want to make a top-level auxiliary binding. E.g. for comparison we have instance Ord T where compare a b = $con2tag a `compare` $con2tag b diff --git a/compiler/utils/Digraph.hs b/compiler/utils/Digraph.hs index cb401be274..c205c45d8d 100644 --- a/compiler/utils/Digraph.hs +++ b/compiler/utils/Digraph.hs @@ -158,7 +158,7 @@ type ReduceFn key payload = Note [reduceNodesIntoVertices implementations] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ reduceNodesIntoVertices is parameterized by the container type. -This is to accomodate key types that don't have an Ord instance +This is to accommodate key types that don't have an Ord instance and hence preclude the use of Data.Map. An example of such type would be Unique, there's no way to implement Ord Unique deterministically. |