summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--compiler/basicTypes/DataCon.hs2
-rw-r--r--compiler/basicTypes/Demand.hs2
-rw-r--r--compiler/cmm/CmmLex.x2
-rw-r--r--compiler/cmm/CmmParse.y2
-rw-r--r--compiler/coreSyn/CoreSubst.hs10
-rw-r--r--compiler/deSugar/DsExpr.hs2
-rw-r--r--compiler/iface/MkIface.hs2
-rw-r--r--compiler/parser/Parser.y2
-rw-r--r--compiler/simplCore/Simplify.hs2
-rw-r--r--compiler/specialise/SpecConstr.hs2
-rw-r--r--compiler/stranal/DmdAnal.hs2
-rw-r--r--compiler/typecheck/TcDeriv.hs2
-rw-r--r--compiler/typecheck/TcInteract.hs2
-rw-r--r--compiler/typecheck/TcPat.hs2
-rw-r--r--compiler/typecheck/TcSimplify.hs2
-rw-r--r--compiler/typecheck/TcSplice.hs2
-rw-r--r--compiler/typecheck/TcType.hs4
-rw-r--r--compiler/types/Coercion.hs2
-rw-r--r--compiler/utils/GraphOps.hs4
-rw-r--r--compiler/utils/Pretty.hs2
-rw-r--r--compiler/vectorise/Vectorise/Generic/PAMethods.hs2
-rw-r--r--compiler/vectorise/Vectorise/Utils/Base.hs2
-rw-r--r--docs/users_guide/debugging.xml2
-rw-r--r--docs/users_guide/glasgow_exts.xml2
-rw-r--r--includes/Rts.h2
-rw-r--r--rts/RetainerProfile.c2
-rw-r--r--rts/ghc.mk2
-rw-r--r--testsuite/tests/ffi/should_fail/ccfail004.stderr6
-rw-r--r--testsuite/tests/perf/compiler/all.T4
-rw-r--r--testsuite/tests/programs/galois_raytrace/Data.hs2
-rw-r--r--testsuite/tests/stranal/should_compile/newtype.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc202.hs2
-rw-r--r--utils/genprimopcode/Lexer.x2
-rw-r--r--utils/genprimopcode/Parser.y2
-rw-r--r--utils/hpc/HpcParser.y2
35 files changed, 44 insertions, 44 deletions
diff --git a/compiler/basicTypes/DataCon.hs b/compiler/basicTypes/DataCon.hs
index a2a4226719..a6db5ace65 100644
--- a/compiler/basicTypes/DataCon.hs
+++ b/compiler/basicTypes/DataCon.hs
@@ -179,7 +179,7 @@ Why might the wrapper have anything to do? Two reasons:
The wrapper has the programmer-specified type:
\$wMkT :: a -> T [a]
\$wMkT a x = MkT [a] a [a] x
- The third argument is a coerion
+ The third argument is a coercion
[a] :: [a]~[a]
INVARIANT: the dictionary constructor for a class
diff --git a/compiler/basicTypes/Demand.hs b/compiler/basicTypes/Demand.hs
index a8fb0b6aa5..9aa3b8f028 100644
--- a/compiler/basicTypes/Demand.hs
+++ b/compiler/basicTypes/Demand.hs
@@ -393,7 +393,7 @@ After strictness analysis:
False -> GHC.Types.True;
True -> foo wild_X7 }
-It's true that ds_dnz is *itself* absent, b ut the use of wild_X7 means
+It's true that ds_dnz is *itself* absent, but the use of wild_X7 means
that it is very much alive and demanded. See Trac #10148 for how the
consequences play out.
diff --git a/compiler/cmm/CmmLex.x b/compiler/cmm/CmmLex.x
index 9e688ddec2..65c85f1ac4 100644
--- a/compiler/cmm/CmmLex.x
+++ b/compiler/cmm/CmmLex.x
@@ -13,7 +13,7 @@
{
{-# LANGUAGE BangPatterns #-}
{-# OPTIONS -Wwarn -w #-}
--- The above -Wwarn supression flag is a temporary kludge.
+-- The above -Wwarn suppression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See
-- http://ghc.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y
index 6c4b835fc3..fca231e988 100644
--- a/compiler/cmm/CmmParse.y
+++ b/compiler/cmm/CmmParse.y
@@ -197,7 +197,7 @@ convention.
{
{-# LANGUAGE BangPatterns #-} -- required for versions of Happy before 1.18.6
{-# OPTIONS -Wwarn -w #-}
--- The above warning supression flag is a temporary kludge.
+-- The above warning suppression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See
-- http://ghc.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
diff --git a/compiler/coreSyn/CoreSubst.hs b/compiler/coreSyn/CoreSubst.hs
index b381dc8db7..52f4c0d7aa 100644
--- a/compiler/coreSyn/CoreSubst.hs
+++ b/compiler/coreSyn/CoreSubst.hs
@@ -768,7 +768,7 @@ InlVanilla. The WARN is just so I can see if it happens a lot.
* *
************************************************************************
-Note [Optimise coercion boxes agressively]
+Note [Optimise coercion boxes aggressively]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The simple expression optimiser needs to deal with Eq# boxes as follows:
@@ -789,7 +789,7 @@ We do this for two reasons:
2. The test T4356 fails Lint because it creates a coercion between types
of kind (* -> * -> *) and (?? -> ? -> *), which differ. If we do this
- inlining agressively we can collapse away the intermediate coercion between
+ inlining aggressively we can collapse away the intermediate coercion between
these two types and hence pass Lint again. (This is a sort of a hack.)
In fact, our implementation uses slightly liberalised versions of the second rule
@@ -827,7 +827,7 @@ simpleOptExpr :: CoreExpr -> CoreExpr
-- or where the RHS is trivial
--
-- We also inline bindings that bind a Eq# box: see
--- See Note [Optimise coercion boxes agressively].
+-- See Note [Optimise coercion boxes aggressively].
--
-- The result is NOT guaranteed occurrence-analysed, because
-- in (let x = y in ....) we substitute for x; so y's occ-info
@@ -904,7 +904,7 @@ simple_opt_expr subst expr
go lam@(Lam {}) = go_lam [] subst lam
go (Case e b ty as)
- -- See Note [Optimise coercion boxes agressively]
+ -- See Note [Optimise coercion boxes aggressively]
| isDeadBinder b
, Just (con, _tys, es) <- exprIsConApp_maybe in_scope_env e'
, Just (altcon, bs, rhs) <- findAlt (DataAlt con) as
@@ -1034,7 +1034,7 @@ maybe_substitute subst b r
| (Var fun, args) <- collectArgs r
, Just dc <- isDataConWorkId_maybe fun
, dc `hasKey` eqBoxDataConKey || dc `hasKey` coercibleDataConKey
- , all exprIsTrivial args = True -- See Note [Optimise coercion boxes agressively]
+ , all exprIsTrivial args = True -- See Note [Optimise coercion boxes aggressively]
| otherwise = False
----------------------
diff --git a/compiler/deSugar/DsExpr.hs b/compiler/deSugar/DsExpr.hs
index 21fbe94f56..42aa22245e 100644
--- a/compiler/deSugar/DsExpr.hs
+++ b/compiler/deSugar/DsExpr.hs
@@ -485,7 +485,7 @@ For record construction we do this (assuming T has three arguments)
e
(recConErr t1 "M.hs/230/op3")
\end{verbatim}
-@recConErr@ then converts its arugment string into a proper message
+@recConErr@ then converts its argument string into a proper message
before printing it as
\begin{verbatim}
M.hs, line 230: missing field op1 was evaluated
diff --git a/compiler/iface/MkIface.hs b/compiler/iface/MkIface.hs
index 91e5a68706..2b094a01b2 100644
--- a/compiler/iface/MkIface.hs
+++ b/compiler/iface/MkIface.hs
@@ -1703,7 +1703,7 @@ tyConToIfaceDecl env tycon
-- (a) we don't need to redundantly put them into the interface file
-- (b) when pretty-printing an Iface data declaration in H98-style syntax,
-- we know that the type variables will line up
- -- The latter (b) is important because we pretty-print type construtors
+ -- The latter (b) is important because we pretty-print type constructors
-- by converting to IfaceSyn and pretty-printing that
con_env1 = (fst tc_env1, mkVarEnv (zipEqual "ifaceConDecl" univ_tvs tc_tyvars))
-- A bit grimy, perhaps, but it's simple!
diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index de93796aaa..7c1166e433 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -10,7 +10,7 @@
{
{-# LANGUAGE BangPatterns #-} -- required for versions of Happy before 1.18.6
{-# OPTIONS -Wwarn -w #-}
--- The above warning supression flag is a temporary kludge.
+-- The above warning suppression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See
-- http://ghc.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
diff --git a/compiler/simplCore/Simplify.hs b/compiler/simplCore/Simplify.hs
index 933fa7a884..aee62000fe 100644
--- a/compiler/simplCore/Simplify.hs
+++ b/compiler/simplCore/Simplify.hs
@@ -515,7 +515,7 @@ we'd like to transform it to
x' = e
x = x `cast` co -- A trivial binding
There's a chance that e will be a constructor application or function, or something
-like that, so moving the coerion to the usage site may well cancel the coersions
+like that, so moving the coercion to the usage site may well cancel the coercions
and lead to further optimisation. Example:
data family T a :: *
diff --git a/compiler/specialise/SpecConstr.hs b/compiler/specialise/SpecConstr.hs
index 64e2cd1c14..42c2558ce6 100644
--- a/compiler/specialise/SpecConstr.hs
+++ b/compiler/specialise/SpecConstr.hs
@@ -1093,7 +1093,7 @@ evalScrutOcc = ScrutOcc emptyUFM
-- Experimentally, this vesion of combineOcc makes ScrutOcc "win", so
-- that if the thing is scrutinised anywhere then we get to see that
-- in the overall result, even if it's also used in a boxed way
--- This might be too agressive; see Note [Reboxing] Alternative 3
+-- This might be too aggressive; see Note [Reboxing] Alternative 3
combineOcc :: ArgOcc -> ArgOcc -> ArgOcc
combineOcc NoOcc occ = occ
combineOcc occ NoOcc = occ
diff --git a/compiler/stranal/DmdAnal.hs b/compiler/stranal/DmdAnal.hs
index d87d868408..24ca3edd73 100644
--- a/compiler/stranal/DmdAnal.hs
+++ b/compiler/stranal/DmdAnal.hs
@@ -308,7 +308,7 @@ io_hack_reqd :: DataCon -> [Var] -> Bool
-- case foo x s of { (# s, r #) -> y }
-- Is this strict in 'y'. Normally yes, but what if 'foo' is an I/O
-- operation that simply terminates the program (not in an erroneous way)?
--- In that case we should not evaluate y before the call to 'foo'.
+-- In that case we should not evaluate 'y' before the call to 'foo'.
-- Hackish solution: spot the IO-like situation and add a virtual branch,
-- as if we had
-- case foo x s of
diff --git a/compiler/typecheck/TcDeriv.hs b/compiler/typecheck/TcDeriv.hs
index 7719c08534..6c631df592 100644
--- a/compiler/typecheck/TcDeriv.hs
+++ b/compiler/typecheck/TcDeriv.hs
@@ -1601,7 +1601,7 @@ mkNewTypeEqn dflags overlap_mode tvs
substTheta (zipOpenTvSubst cls_tyvars inst_tys) (classSCTheta cls)
- -- Next we collect Coercible constaints between
+ -- Next we collect Coercible constraints between
-- the Class method types, instantiated with the representation and the
-- newtype type; precisely the constraints required for the
-- calls to coercible that we are going to generate.
diff --git a/compiler/typecheck/TcInteract.hs b/compiler/typecheck/TcInteract.hs
index 15ef8e1906..84941531f7 100644
--- a/compiler/typecheck/TcInteract.hs
+++ b/compiler/typecheck/TcInteract.hs
@@ -1844,7 +1844,7 @@ isCallStackIP _ _ _
-- | Assumes that we've checked that this is the 'Typeable' class,
--- and it was applied to the correc arugment.
+-- and it was applied to the correct argument.
matchTypeableClass :: Class -> Kind -> Type -> CtLoc -> TcS LookupInstResult
matchTypeableClass clas k t loc
| isForAllTy k = return NoInstance
diff --git a/compiler/typecheck/TcPat.hs b/compiler/typecheck/TcPat.hs
index 54d88cfe1c..93c4728e45 100644
--- a/compiler/typecheck/TcPat.hs
+++ b/compiler/typecheck/TcPat.hs
@@ -690,7 +690,7 @@ are not made available in the RHS of the match. For example
f :: T a -> Int -> a
f ~(T1 i) y = y
It's obviously not sound to refine a to Int in the right
-hand side, because the arugment might not match T1 at all!
+hand side, because the argument might not match T1 at all!
Finally, a lazy pattern should not bind any existential type variables
because they won't be in scope when we do the desugaring
diff --git a/compiler/typecheck/TcSimplify.hs b/compiler/typecheck/TcSimplify.hs
index f528da33fe..be5121d181 100644
--- a/compiler/typecheck/TcSimplify.hs
+++ b/compiler/typecheck/TcSimplify.hs
@@ -351,7 +351,7 @@ simplifyInfer rhs_tclvl apply_mr name_taus wanteds
<- decideQuantification apply_mr quant_pred_candidates zonked_tau_tvs
-- Emit an implication constraint for the
- -- remaining constaints from the RHS
+ -- remaining constraints from the RHS
; bound_ev_vars <- mapM TcM.newEvVar bound_theta
; let skol_info = InferSkol [ (name, mkSigmaTy [] bound_theta ty)
| (name, ty) <- name_taus ]
diff --git a/compiler/typecheck/TcSplice.hs b/compiler/typecheck/TcSplice.hs
index f2efc93516..544950ef7b 100644
--- a/compiler/typecheck/TcSplice.hs
+++ b/compiler/typecheck/TcSplice.hs
@@ -1388,7 +1388,7 @@ annotation anyway. This should be a rare case, indeed. Here is an example:
Here G's kind is (forall k. k -> k), and the desugared RHS of that last
instance of F is (G (* -> (* -> *) -> *) (T1 * (* -> *)) Bool). According to
-the algoritm above, there are 3 arguments to G so we should peel off 3
+the algorithm above, there are 3 arguments to G so we should peel off 3
arguments in G's kind. But G's kind has only two arguments. This is the
rare special case, and we conservatively choose to put the annotation
in.
diff --git a/compiler/typecheck/TcType.hs b/compiler/typecheck/TcType.hs
index ca1ecaa55c..4185be8214 100644
--- a/compiler/typecheck/TcType.hs
+++ b/compiler/typecheck/TcType.hs
@@ -1647,8 +1647,8 @@ checkRepTyCon check_tc ty extra
where
msg = quotes (ppr ty) <+> ptext (sLit "cannot be marshalled in a foreign call")
mk_nt_reason tc tys
- | null tys = ptext (sLit "because its data construtor is not in scope")
- | otherwise = ptext (sLit "because the data construtor for")
+ | null tys = ptext (sLit "because its data constructor is not in scope")
+ | otherwise = ptext (sLit "because the data constructor for")
<+> quotes (ppr tc) <+> ptext (sLit "is not in scope")
nt_fix = ptext (sLit "Possible fix: import the data constructor to bring it into scope")
diff --git a/compiler/types/Coercion.hs b/compiler/types/Coercion.hs
index ef70884ec6..e6e21b1961 100644
--- a/compiler/types/Coercion.hs
+++ b/compiler/types/Coercion.hs
@@ -472,7 +472,7 @@ it, assume the following definition:
type instance F Int = Bool -- Axiom axF : F Int ~N Bool
newtype Age = MkAge Int -- Axiom axAge : Age ~R Int
- data Foo a = MkFoo a -- Role on Foo's parameter is Represntational
+ data Foo a = MkFoo a -- Role on Foo's parameter is Representational
TyConAppCo Nominal Foo axF : Foo (F Int) ~N Foo Bool
For (TyConAppCo Nominal) all arguments must have role Nominal. Why?
diff --git a/compiler/utils/GraphOps.hs b/compiler/utils/GraphOps.hs
index 804153dad2..ba0db0f9f9 100644
--- a/compiler/utils/GraphOps.hs
+++ b/compiler/utils/GraphOps.hs
@@ -270,7 +270,7 @@ addPreference (u, c) color
u
--- | Do agressive coalescing on this graph.
+-- | Do aggressive coalescing on this graph.
-- returns the new graph and the list of pairs of nodes that got coaleced together.
-- for each pair, the resulting node will have the least key and be second in the pair.
--
@@ -322,7 +322,7 @@ coalesceGraph' aggressive triv graph kkPairsAcc
pairs -> coalesceGraph' aggressive triv graph' (reverse pairs ++ kkPairsAcc)
--- | Coalesce this pair of nodes unconditionally \/ agressively.
+-- | Coalesce this pair of nodes unconditionally \/ aggressively.
-- The resulting node is the one with the least key.
--
-- returns: Just the pair of keys if the nodes were coalesced
diff --git a/compiler/utils/Pretty.hs b/compiler/utils/Pretty.hs
index 5e441838fc..061689ef58 100644
--- a/compiler/utils/Pretty.hs
+++ b/compiler/utils/Pretty.hs
@@ -448,7 +448,7 @@ The argument of @NilAbove@ is never @Empty@. Therefore
a @NilAbove@ occupies at least two lines.
\item
-The arugment of @TextBeside@ is never @Nest@.
+The argument of @TextBeside@ is never @Nest@.
\item
The layouts of the two arguments of @Union@ both flatten to the same string.
diff --git a/compiler/vectorise/Vectorise/Generic/PAMethods.hs b/compiler/vectorise/Vectorise/Generic/PAMethods.hs
index 0d5d37c7d7..2f4e23e393 100644
--- a/compiler/vectorise/Vectorise/Generic/PAMethods.hs
+++ b/compiler/vectorise/Vectorise/Generic/PAMethods.hs
@@ -365,7 +365,7 @@ buildToArrPReprs vect_tc repr_co _ pdatas_tc r
-- eg: (xss :: PDatas (Tree a b))
varg <- newLocalVar (fsLit "xss") arg_ty
- -- Coersion to case between the (PRepr a) type and its instance.
+ -- Coercion to case between the (PRepr a) type and its instance.
pdatas_co <- mkBuiltinCo pdatasTyCon
let co = mkAppCo pdatas_co
. mkSymCo
diff --git a/compiler/vectorise/Vectorise/Utils/Base.hs b/compiler/vectorise/Vectorise/Utils/Base.hs
index dc1f210369..9c603807d6 100644
--- a/compiler/vectorise/Vectorise/Utils/Base.hs
+++ b/compiler/vectorise/Vectorise/Utils/Base.hs
@@ -130,7 +130,7 @@ splitPrimTyCon ty
-- Coercion Construction -----------------------------------------------------
--- |Make a representational coersion to some builtin type.
+-- |Make a representational coercion to some builtin type.
--
mkBuiltinCo :: (Builtins -> TyCon) -> VM Coercion
mkBuiltinCo get_tc
diff --git a/docs/users_guide/debugging.xml b/docs/users_guide/debugging.xml
index aebb928ae8..a0fee40749 100644
--- a/docs/users_guide/debugging.xml
+++ b/docs/users_guide/debugging.xml
@@ -530,7 +530,7 @@
</sect2>
- <sect2 id="supression">
+ <sect2 id="suppression">
<title>Suppressing unwanted information</title>
<indexterm><primary>suppression</primary></indexterm>
diff --git a/docs/users_guide/glasgow_exts.xml b/docs/users_guide/glasgow_exts.xml
index 832b02fff3..630f2b47da 100644
--- a/docs/users_guide/glasgow_exts.xml
+++ b/docs/users_guide/glasgow_exts.xml
@@ -4964,7 +4964,7 @@ Specfically, <option>-XFlexibleContexts</option>, allows (well-kinded) class con
of form <literal>(C t1 ... tn)</literal> in the context of an instance declaration.
</para>
<para>
-Notice that the flag does not affect equality constaints in an instance context;
+Notice that the flag does not affect equality constraints in an instance context;
they are permitted by <option>-XTypeFamilies</option> or <option>-XGADTs</option>.
</para>
<para>
diff --git a/includes/Rts.h b/includes/Rts.h
index 190200aa34..e6e36f846e 100644
--- a/includes/Rts.h
+++ b/includes/Rts.h
@@ -191,7 +191,7 @@ INLINE_HEADER Time fsecondsToTime (double t)
#include "rts/Config.h"
-/* Global constaints */
+/* Global constraints */
#include "rts/Constants.h"
/* Profiling information */
diff --git a/rts/RetainerProfile.c b/rts/RetainerProfile.c
index f3e8c72eb8..78daa892ad 100644
--- a/rts/RetainerProfile.c
+++ b/rts/RetainerProfile.c
@@ -2199,7 +2199,7 @@ checkHeapSanityForRetainerProfiling( void )
/*
After all live objects have been scavenged, the garbage
collector may create some objects in
- scheduleFinalizers(). These objects are created throught
+ scheduleFinalizers(). These objects are created through
allocate(), so the small object pool or the large object
pool of the g0s0 may not be empty.
*/
diff --git a/rts/ghc.mk b/rts/ghc.mk
index 7ba4320f90..787f67a12d 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -422,7 +422,7 @@ rts/RetainerSet_CC_OPTS += -Wno-format
# On Windows:
rts/win32/ConsoleHandler_CC_OPTS += -w
rts/win32/ThrIOManager_CC_OPTS += -w
-# The above warning supression flags are a temporary kludge.
+# The above warning suppression flags are a temporary kludge.
# While working on this module you are encouraged to remove it and fix
# any warnings in the module. See
# http://ghc.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings
diff --git a/testsuite/tests/ffi/should_fail/ccfail004.stderr b/testsuite/tests/ffi/should_fail/ccfail004.stderr
index f54ac91aa3..825c47ca1e 100644
--- a/testsuite/tests/ffi/should_fail/ccfail004.stderr
+++ b/testsuite/tests/ffi/should_fail/ccfail004.stderr
@@ -2,7 +2,7 @@
ccfail004.hs:9:1:
Unacceptable argument type in foreign declaration:
‘NInt’ cannot be marshalled in a foreign call
- because its data construtor is not in scope
+ because its data constructor is not in scope
Possible fix: import the data constructor to bring it into scope
When checking declaration:
foreign import ccall safe "static f1" f1 :: NInt -> IO Int
@@ -10,7 +10,7 @@ ccfail004.hs:9:1:
ccfail004.hs:10:1:
Unacceptable result type in foreign declaration:
‘NInt’ cannot be marshalled in a foreign call
- because its data construtor is not in scope
+ because its data constructor is not in scope
Possible fix: import the data constructor to bring it into scope
When checking declaration:
foreign import ccall safe "static f2" f2 :: Int -> IO NInt
@@ -18,7 +18,7 @@ ccfail004.hs:10:1:
ccfail004.hs:11:1:
Unacceptable result type in foreign declaration:
‘NIO Int’ cannot be marshalled in a foreign call
- because the data construtor for ‘NIO’ is not in scope
+ because the data constructor for ‘NIO’ is not in scope
Possible fix: import the data constructor to bring it into scope
When checking declaration:
foreign import ccall safe "static f3" f3 :: Int -> NIO Int
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index 6c4ffee04f..6813f52c4d 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -329,7 +329,7 @@ test('T5030',
# previous: 196457520
# 2012-10-08: 259547660 (x86/Linux, new codegen)
# 2013-11-21: 198573456 (x86 Windows, 64 bit machine)
- # 2014-12-10: 227205560 constraint solver got worse again; more agressive solving
+ # 2014-12-10: 227205560 constraint solver got worse again; more aggressive solving
# of family-applications leads to less sharing, I think
(wordsize(64), 403932600, 10)]),
@@ -346,7 +346,7 @@ test('T5030',
# general round of updates
# 2014-09-10 385152728 post-AMP-cleanup
# 2014-12-08 340969128 constraint solver perf improvements (esp kick-out)
- # 2014-12-10 449042120 constraint solver got worse again; more agressive solving
+ # 2014-12-10 449042120 constraint solver got worse again; more aggressive solving
# of family-applications leads to less sharing, I think
# 2015-03-17 403932600 tweak to solver algorithm
diff --git a/testsuite/tests/programs/galois_raytrace/Data.hs b/testsuite/tests/programs/galois_raytrace/Data.hs
index d103766a57..a92eb9bf23 100644
--- a/testsuite/tests/programs/galois_raytrace/Data.hs
+++ b/testsuite/tests/programs/galois_raytrace/Data.hs
@@ -215,7 +215,7 @@ opcodes =
, ("false", TBool False, error "incorrect use of false")
, ("true", TBool True, error "incorrect use of true")
] ++ map (\ (a,b,c) -> (a,TOp b,c))
- -- These are just invocation, any coersions need to occur between here
+ -- These are just invocation, any coercions need to occur between here
-- and before arriving at the application code (like deg -> rad).
[ ("acos", Op_acos, Real_Real (rad2deg . acos))
, ("addi", Op_addi, Int_Int_Int (+))
diff --git a/testsuite/tests/stranal/should_compile/newtype.hs b/testsuite/tests/stranal/should_compile/newtype.hs
index c68df28111..8d3441fb72 100644
--- a/testsuite/tests/stranal/should_compile/newtype.hs
+++ b/testsuite/tests/stranal/should_compile/newtype.hs
@@ -1,5 +1,5 @@
-- This one killed GHC 6.4 because it bogusly attributed
--- the CPR property to the construtor T
+-- the CPR property to the constructor T
-- Result: a mkWWcpr crash
-- Needs -prof -auto-all to show it up
diff --git a/testsuite/tests/typecheck/should_compile/tc202.hs b/testsuite/tests/typecheck/should_compile/tc202.hs
index 7280606388..c8e07914ce 100644
--- a/testsuite/tests/typecheck/should_compile/tc202.hs
+++ b/testsuite/tests/typecheck/should_compile/tc202.hs
@@ -1,5 +1,5 @@
--- Tests that subFunTys works when the arugment is a type of form (a ty1 ty2)
+-- Tests that subFunTys works when the argument is a type of form (a ty1 ty2)
module ShouldCompile where
diff --git a/utils/genprimopcode/Lexer.x b/utils/genprimopcode/Lexer.x
index 527a03fe72..4887f46cca 100644
--- a/utils/genprimopcode/Lexer.x
+++ b/utils/genprimopcode/Lexer.x
@@ -2,7 +2,7 @@
{
{-# LANGUAGE BangPatterns #-} -- required for versions of Alex before 2.3.4
{-# OPTIONS -w -Wwarn #-}
--- The above warning supression flag is a temporary kludge.
+-- The above warning suppression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See
-- http://ghc.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
diff --git a/utils/genprimopcode/Parser.y b/utils/genprimopcode/Parser.y
index 424efe6a4a..c70ff1ae89 100644
--- a/utils/genprimopcode/Parser.y
+++ b/utils/genprimopcode/Parser.y
@@ -1,7 +1,7 @@
{
{-# LANGUAGE BangPatterns #-} -- required for versions of Happy before 1.18.6
{-# OPTIONS -w -Wwarn #-}
--- The above warning supression flag is a temporary kludge.
+-- The above warning suppression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See
-- http://ghc.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
diff --git a/utils/hpc/HpcParser.y b/utils/hpc/HpcParser.y
index 6ca173a3ff..5f8bf903bb 100644
--- a/utils/hpc/HpcParser.y
+++ b/utils/hpc/HpcParser.y
@@ -9,7 +9,7 @@
-- the generalisation. Better would be to make Happy generate
-- an appropriate signature.
--
--- The above warning supression flag is a temporary kludge.
+-- The above warning suppression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See
-- http://ghc.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings