Fix typos in diagnostics, testsuite and comments

30 files changed, 38 insertions, 38 deletions

diff --git a/compiler/basicTypes/Literal.hs b/compiler/basicTypes/Literal.hs
index f14606e8cf..1c06350e83 100644
--- a/compiler/basicTypes/Literal.hs
+++ b/compiler/basicTypes/Literal.hs
@@ -512,7 +512,7 @@ literalType (MachLabel _ _ _) = addrPrimTy
 literalType (LitInteger _ t) = t
 
 absentLiteralOf :: TyCon -> Maybe Literal
--- Return a literal of the appropriate primtive
+-- Return a literal of the appropriate primitive
 -- TyCon, to use as a placeholder when it doesn't matter
 absentLiteralOf tc = lookupUFM absent_lits (tyConName tc)
 
diff --git a/compiler/codeGen/StgCmmHeap.hs b/compiler/codeGen/StgCmmHeap.hs
index db62985e3c..000045f363 100644
--- a/compiler/codeGen/StgCmmHeap.hs
+++ b/compiler/codeGen/StgCmmHeap.hs
@@ -226,7 +226,7 @@ mkStaticClosure dflags info_lbl ccs payload padding static_link_field saved_info
   ++ static_link_field
   ++ saved_info_field
 
--- JD: Simon had ellided this padding, but without it the C back end asserts
+-- JD: Simon had elided this padding, but without it the C back end asserts
 -- failure. Maybe it's a bad assertion, and this padding is indeed unnecessary?
 padLitToWord :: DynFlags -> CmmLit -> [CmmLit]
 padLitToWord dflags lit = lit : padding pad_length
diff --git a/compiler/deSugar/DsBinds.hs b/compiler/deSugar/DsBinds.hs
index 9d0cbfbdb9..2b39eeb7a2 100644
--- a/compiler/deSugar/DsBinds.hs
+++ b/compiler/deSugar/DsBinds.hs
@@ -1013,7 +1013,7 @@ drop_dicts drops dictionary bindings on the LHS where possible.
              RULE forall s (d :: MonadAbstractIOST (ReaderT s)).
                 useAbstractMonad (ReaderT s) d = $suseAbstractMonad s
 
-   Trac #8848 is a good example of where there are some intersting
+   Trac #8848 is a good example of where there are some interesting
    dictionary bindings to discard.
 
 The drop_dicts algorithm is based on these observations:
diff --git a/compiler/deSugar/DsCCall.hs b/compiler/deSugar/DsCCall.hs
index 2a5769f6e2..f24dd9fea7 100644
--- a/compiler/deSugar/DsCCall.hs
+++ b/compiler/deSugar/DsCCall.hs
@@ -134,7 +134,7 @@ unboxArg :: CoreExpr                    -- The supplied argument, not levity-pol
 -- always returns a non-levity-polymorphic expression
 
 unboxArg arg
-  -- Primtive types: nothing to unbox
+  -- Primitive types: nothing to unbox
   | isPrimitiveType arg_ty
   = return (arg, \body -> body)
 
diff --git a/compiler/nativeGen/PPC/Regs.hs b/compiler/nativeGen/PPC/Regs.hs
index a1befc7837..5c7c5aec90 100644
--- a/compiler/nativeGen/PPC/Regs.hs
+++ b/compiler/nativeGen/PPC/Regs.hs
@@ -70,7 +70,7 @@ import Data.Int         ( Int8, Int16, Int32, Int64 )
 -- squeese functions for the graph allocator -----------------------------------
 
 -- | regSqueeze_class reg
---      Calculuate the maximum number of register colors that could be
+--      Calculate the maximum number of register colors that could be
 --      denied to a node of this class due to having this reg
 --      as a neighbour.
 --
diff --git a/compiler/nativeGen/SPARC/Regs.hs b/compiler/nativeGen/SPARC/Regs.hs
index 14a5192c2d..188f66e482 100644
--- a/compiler/nativeGen/SPARC/Regs.hs
+++ b/compiler/nativeGen/SPARC/Regs.hs
@@ -75,7 +75,7 @@ classOfRealReg reg
 
 
 -- | regSqueeze_class reg
---      Calculuate the maximum number of register colors that could be
+--      Calculate the maximum number of register colors that could be
 --      denied to a node of this class due to having this reg
 --      as a neighbour.
 --
diff --git a/compiler/nativeGen/X86/Regs.hs b/compiler/nativeGen/X86/Regs.hs
index 8bb36ad722..c81850c736 100644
--- a/compiler/nativeGen/X86/Regs.hs
+++ b/compiler/nativeGen/X86/Regs.hs
@@ -61,7 +61,7 @@ import Platform
 import qualified Data.Array as A
 
 -- | regSqueeze_class reg
---      Calculuate the maximum number of register colors that could be
+--      Calculate the maximum number of register colors that could be
 --      denied to a node of this class due to having this reg
 --      as a neighbour.
 --
diff --git a/compiler/rename/RnEnv.hs b/compiler/rename/RnEnv.hs
index 175cb6b518..d5013b2a2c 100644
--- a/compiler/rename/RnEnv.hs
+++ b/compiler/rename/RnEnv.hs
@@ -1253,7 +1253,7 @@ It is enabled by default and disabled by the flag
 
 Note [Safe Haskell and GHCi]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-We DONT do this Safe Haskell as we need to check imports. We can
+We DON'T do this Safe Haskell as we need to check imports. We can
 and should instead check the qualified import but at the moment
 this requires some refactoring so leave as a TODO
 -}
diff --git a/compiler/simplCore/OccurAnal.hs b/compiler/simplCore/OccurAnal.hs
index 1ae5bbeda7..dace6a04c2 100644
--- a/compiler/simplCore/OccurAnal.hs
+++ b/compiler/simplCore/OccurAnal.hs
@@ -170,7 +170,7 @@ we treat it like this (occAnalRecBind):
 
 4. To do so we form a new set of Nodes, with the same details, but
    different edges, the "loop-breaker nodes". The loop-breaker nodes
-   have both more and fewer depedencies than the scope edges
+   have both more and fewer dependencies than the scope edges
    (see Note [Choosing loop breakers])
 
    More edges: if f calls g, and g has an active rule that mentions h
diff --git a/compiler/simplCore/SetLevels.hs b/compiler/simplCore/SetLevels.hs
index f6077dc39f..5e1d70273b 100644
--- a/compiler/simplCore/SetLevels.hs
+++ b/compiler/simplCore/SetLevels.hs
@@ -120,7 +120,7 @@ data FloatSpec
   = FloatMe Level       -- Float to just inside the binding
                         --    tagged with this level
   | StayPut Level       -- Stay where it is; binding is
-                        --     tagged with tihs level
+                        --     tagged with this level
 
 floatSpecLevel :: FloatSpec -> Level
 floatSpecLevel (FloatMe l) = l
diff --git a/compiler/specialise/SpecConstr.hs b/compiler/specialise/SpecConstr.hs
index e5af0b8a3c..2b9c20aa19 100644
--- a/compiler/specialise/SpecConstr.hs
+++ b/compiler/specialise/SpecConstr.hs
@@ -586,7 +586,7 @@ more than N times (controlled by -fspec-constr-recursive=N) we check
     specialisations.  If sc_count is "no limit" then we arbitrarily
     choose 10 as the limit (ugh).
 
-See Trac #5550.   Also Trac #13623, where this test had become over-agressive,
+See Trac #5550.   Also Trac #13623, where this test had become over-aggressive,
 and we lost a wonderful specialisation that we really wanted!
 
 Note [NoSpecConstr]
diff --git a/compiler/stgSyn/StgLint.hs b/compiler/stgSyn/StgLint.hs
index 90628f050d..d7ecbe6345 100644
--- a/compiler/stgSyn/StgLint.hs
+++ b/compiler/stgSyn/StgLint.hs
@@ -426,7 +426,7 @@ checkFunApp fun_ty arg_tys msg
       = (Nothing, Nothing)
 
 -- | "Compare" types. We used to try a crude comparison of the type themselves,
--- but this is essentially impossible in STG as we have discarded. both casts
+-- but this is essentially impossible in STG as we have discarded both casts
 -- and type applications, so types might look different but be the same. Now we
 -- simply compare their runtime representations. See #14120.
 stgEqType :: Type -> Type -> Bool
diff --git a/compiler/typecheck/TcGenDeriv.hs b/compiler/typecheck/TcGenDeriv.hs
index 00ed9edc11..4af8b024d1 100644
--- a/compiler/typecheck/TcGenDeriv.hs
+++ b/compiler/typecheck/TcGenDeriv.hs
@@ -458,7 +458,7 @@ gen_Ord_binds loc tycon = do
 
     mkTagCmp :: DynFlags -> OrdOp -> LHsExpr GhcPs
     -- Both constructors known to be nullary
-    -- genreates (case data2Tag a of a# -> case data2Tag b of b# -> a# `op` b#
+    -- generates (case data2Tag a of a# -> case data2Tag b of b# -> a# `op` b#
     mkTagCmp dflags op =
       untag_Expr dflags tycon[(a_RDR, ah_RDR),(b_RDR, bh_RDR)] $
         unliftedOrdOp tycon intPrimTy op ah_RDR bh_RDR
diff --git a/compiler/typecheck/TcInstDcls.hs b/compiler/typecheck/TcInstDcls.hs
index 2f3d358361..e5a747619b 100644
--- a/compiler/typecheck/TcInstDcls.hs
+++ b/compiler/typecheck/TcInstDcls.hs
@@ -1670,7 +1670,7 @@ generic default methods.
 Note [INLINE and default methods]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Default methods need special case.  They are supposed to behave rather like
-macros.  For exmample
+macros.  For example
 
   class Foo a where
     op1, op2 :: Bool -> a -> a
diff --git a/compiler/typecheck/TcUnify.hs b/compiler/typecheck/TcUnify.hs
index 56cc95dfc9..5ae8c09f8b 100644
--- a/compiler/typecheck/TcUnify.hs
+++ b/compiler/typecheck/TcUnify.hs
@@ -1153,7 +1153,7 @@ buildImplication skol_info skol_tvs given thing_inside
 
          else -- Fast path.  We check every function argument with
               -- tcPolyExpr, which uses tcSkolemise and hence checkConstraints.
-              -- So tihs fast path is well-exercised
+              -- So this fast path is well-exercised
               do { res <- thing_inside
                  ; return (emptyBag, emptyTcEvBinds, res) } }
 
@@ -1162,7 +1162,7 @@ implicationNeeded :: [TcTyVar] -> [EvVar] -> TcM Bool
 -- to have an EvBindsVar for them when they might be deferred to
 -- runtime. Otherwise, they end up as top-level unlifted bindings,
 -- which are verboten. See also Note [Deferred errors for coercion holes]
--- in TcErrors.  cf Trac #14149 for an exmample of what goes wrong.
+-- in TcErrors.  cf Trac #14149 for an example of what goes wrong.
 implicationNeeded skol_tvs given
   | null skol_tvs
   , null given
diff --git a/compiler/types/Type.hs b/compiler/types/Type.hs
index b0f1fac39d..39529ea502 100644
--- a/compiler/types/Type.hs
+++ b/compiler/types/Type.hs
@@ -868,7 +868,7 @@ pprUserTypeErrorTy ty =
       | tyConName tc == typeErrorVAppendDataConName ->
         pprUserTypeErrorTy t1 $$ pprUserTypeErrorTy t2
 
-    -- An uneavaluated type function
+    -- An unevaluated type function
     _ -> ppr ty
 
 
@@ -1186,7 +1186,7 @@ to differ, leading to a contradiction. Thus, co is reflexive.
 Accordingly, by eliminating reflexive casts, splitTyConApp need not worry
 about outermost casts to uphold (*).
 
-Unforunately, that's not the end of the story. Consider comparing
+Unfortunately, that's not the end of the story. Consider comparing
   (T a b c)      =?       (T a b |> (co -> <Type>)) (c |> sym co)
 These two types have the same kind (Type), but the left type is a TyConApp
 while the right type is not. To handle this case, we will have to implement
diff --git a/compiler/utils/Binary.hs b/compiler/utils/Binary.hs
index 99ab07ec33..2859033814 100644
--- a/compiler/utils/Binary.hs
+++ b/compiler/utils/Binary.hs
@@ -498,7 +498,7 @@ instance Binary DiffTime where
 --
 -- TODO  This instance is not architecture portable.  GMP stores numbers as
 -- arrays of machine sized words, so the byte format is not portable across
--- architectures with different endianess and word size.
+-- architectures with different endianness and word size.
 --
 -- This makes it hard (impossible) to make an equivalent instance
 -- with code that is compilable with non-GHC.  Do we need any instance
diff --git a/compiler/utils/Digraph.hs b/compiler/utils/Digraph.hs
index e3b5037bf3..3d9e5a39cb 100644
--- a/compiler/utils/Digraph.hs
+++ b/compiler/utils/Digraph.hs
@@ -314,7 +314,7 @@ stronglyConnCompFromEdgedVerticesUniq
   = map (fmap node_payload) . stronglyConnCompFromEdgedVerticesUniqR
 
 -- The "R" interface is used when you expect to apply SCC to
--- (some of) the result of SCC, so you dont want to lose the dependency info
+-- (some of) the result of SCC, so you don't want to lose the dependency info
 -- See Note [Deterministic SCC]
 -- See Note [reduceNodesIntoVertices implementations]
 stronglyConnCompFromEdgedVerticesOrdR
@@ -325,7 +325,7 @@ stronglyConnCompFromEdgedVerticesOrdR =
   stronglyConnCompG . graphFromEdgedVertices reduceNodesIntoVerticesOrd
 
 -- The "R" interface is used when you expect to apply SCC to
--- (some of) the result of SCC, so you dont want to lose the dependency info
+-- (some of) the result of SCC, so you don't want to lose the dependency info
 -- See Note [Deterministic SCC]
 -- See Note [reduceNodesIntoVertices implementations]
 stronglyConnCompFromEdgedVerticesUniqR
diff --git a/libraries/ghci/GHCi/CreateBCO.hs b/libraries/ghci/GHCi/CreateBCO.hs
index aae4b686fa..ca7726ccff 100644
--- a/libraries/ghci/GHCi/CreateBCO.hs
+++ b/libraries/ghci/GHCi/CreateBCO.hs
@@ -38,9 +38,9 @@ createBCOs bcos = do
 createBCO :: Array Int HValue -> ResolvedBCO -> IO HValue
 createBCO _   ResolvedBCO{..} | resolvedBCOIsLE /= isLittleEndian
   = throwIO (ErrorCall $
-        unlines [ "The endianess of the ResolvedBCO does not match"
-                , "the systems endianess. Using ghc and iserv in a"
-                , "mixed endianess setup is not supported!"
+        unlines [ "The endianness of the ResolvedBCO does not match"
+                , "the systems endianness. Using ghc and iserv in a"
+                , "mixed endianness setup is not supported!"
                 ])
 createBCO arr bco
    = do BCO bco# <- linkBCO' arr bco
diff --git a/libraries/ghci/GHCi/ResolvedBCO.hs b/libraries/ghci/GHCi/ResolvedBCO.hs
index 37836a4e62..f56ee6d6d9 100644
--- a/libraries/ghci/GHCi/ResolvedBCO.hs
+++ b/libraries/ghci/GHCi/ResolvedBCO.hs
@@ -46,9 +46,9 @@ data ResolvedBCO
 
 -- | The Binary instance for ResolvedBCOs.
 --
--- Note, that we do encode the endianess, however there is no support for mixed
--- endianess setups.  This is primarily to ensure that ghc and iserv share the
--- same endianess.
+-- Note, that we do encode the endianness, however there is no support for mixed
+-- endianness setups.  This is primarily to ensure that ghc and iserv share the
+-- same endianness.
 instance Binary ResolvedBCO where
   put ResolvedBCO{..} = do
     put resolvedBCOIsLE
diff --git a/rts/RtsSymbolInfo.h b/rts/RtsSymbolInfo.h
index 08f14a54c5..4c9b24519b 100644
--- a/rts/RtsSymbolInfo.h
+++ b/rts/RtsSymbolInfo.h
@@ -11,7 +11,7 @@
 #include "LinkerInternals.h"
 #include <stdbool.h>
 
-/* See Note [BFD Import library].  */
+/* See Note [BFD import library].  */
 typedef enum _SymbolKind {
     KIND_NORMAL = 0x01,
     KIND_WEAK   = 0x02,
diff --git a/rts/linker/Elf.c b/rts/linker/Elf.c
index 4e881b0c19..58fa593341 100644
--- a/rts/linker/Elf.c
+++ b/rts/linker/Elf.c
@@ -439,7 +439,7 @@ ocVerifyImage_ELF ( ObjectCode* oc )
           if (!SECTION_INDEX_VALID(shdr[i].sh_link)) {
             if (shdr[i].sh_link == SHN_UNDEF)
               errorBelch("\n%s: relocation section #%d has no symbol table\n"
-                         "This object file has probably been fully striped. "
+                         "This object file has probably been fully stripped. "
                          "Such files cannot be linked.\n",
                          oc->archiveMemberName ? oc->archiveMemberName : oc->fileName, i);
             else
diff --git a/testsuite/tests/eyeball/inline2.hs b/testsuite/tests/eyeball/inline2.hs
index ec9b65644a..e77e815414 100644
--- a/testsuite/tests/eyeball/inline2.hs
+++ b/testsuite/tests/eyeball/inline2.hs
@@ -35,6 +35,6 @@ The reason was this:
         i = I# x
 
 Being an unboxed value, we were treating the argument context of x
-as intersting, and hence inlining x in the arg of I#. But then we just
+as interesting, and hence inlining x in the arg of I#. But then we just
 float it out again, giving an infinite loop.
 -}
diff --git a/testsuite/tests/indexed-types/should_compile/CoTest3.hs b/testsuite/tests/indexed-types/should_compile/CoTest3.hs
index d57e58c822..b9a825d251 100644
--- a/testsuite/tests/indexed-types/should_compile/CoTest3.hs
+++ b/testsuite/tests/indexed-types/should_compile/CoTest3.hs
@@ -4,7 +4,7 @@
 {-# LANGUAGE GADTs #-}
 
 -- This test uses the PushC rule of the System FC operational semantics
--- Writen by Tom Schrijvers
+-- Written by Tom Schrijvers
 
 module CoTest3 where
 
diff --git a/testsuite/tests/programs/andy_cherry/Interp.hs b/testsuite/tests/programs/andy_cherry/Interp.hs
index 7d33e896cf..e323dc34f7 100644
--- a/testsuite/tests/programs/andy_cherry/Interp.hs
+++ b/testsuite/tests/programs/andy_cherry/Interp.hs
@@ -94,7 +94,7 @@
        getCurrColour                           `thenP` \ col ->
        let 
            invert Black r   = r -- because the move has *already* happend
-           invert _ "0.00"  = "0.00"   -- dont negate 0
+           invert _ "0.00"  = "0.00"   -- don't negate 0
            invert _ ('-':r) = r
            invert _ r       = '-':r
        in 
diff --git a/testsuite/tests/programs/andy_cherry/andy_cherry.stdout b/testsuite/tests/programs/andy_cherry/andy_cherry.stdout
index 8cb61fe7b3..da1bf8c8bd 100644
--- a/testsuite/tests/programs/andy_cherry/andy_cherry.stdout
+++ b/testsuite/tests/programs/andy_cherry/andy_cherry.stdout
@@ -7076,7 +7076,7 @@ white scored a decisive victory.
 \end{tabular}}|
 \end{center}
 |13.~h3, Bh5; 14.~Nbd2, Rfd8; 15.~Nb3, Qd6; 16.~Qe2, Rab8; 17.~Red1|
-Fritz is deperate to put h3, but I dont see why.
+Fritz is desperate to put h3, but I don't see why.
 \begin{center}|
 {\bf\begin{tabular}{rp{50pt}p{50pt}}
 13 & \ldots & Nh5\\
diff --git a/testsuite/tests/programs/andy_cherry/mygames.pgn b/testsuite/tests/programs/andy_cherry/mygames.pgn
index 742e03bbc9..697b4d66f0 100644
--- a/testsuite/tests/programs/andy_cherry/mygames.pgn
+++ b/testsuite/tests/programs/andy_cherry/mygames.pgn
@@ -1299,7 +1299,7 @@ like Game 7 of the Short-Kasparov WC, where Kasparov as white scored a
 decisive victory.}) 8... Bg4 9. d3 h6 10. Be3 O-O (10... Bxe3 11. Rxe3 
 O-O 12. a4 b4 13. h3 Bh5 14. Nbd2 Rb8 {=}) 11. Bxc5 dxc5 12. Bc2 Qd7 
 13. Nbd2 (13. h3 Bh5 14. Nbd2 Rfd8 15. Nb3 Qd6 16. Qe2 Rab8 17. Red1 {
-Fritz is deperate to put h3, but I dont see why.}) 13... Nh5 {} (13... 
+Fritz is desperate to put h3, but I don't see why.}) 13... Nh5 {} (13... 
 Rad8 {is an idea.}) 14. Nb3 (14. h3 {<saw>,0.33 I now agree with this,
 because the knight block the h5 retreat square.}) 14... Nf4 {?} (14... 
 Qd6 15. h3 Be6 16. Ng5 Bxb3 17. axb3 Nf4 18. Nf3 {<sab>}) 15. Nxc5 Qc8 (
diff --git a/testsuite/tests/programs/galois_raytrace/Geometry.hs b/testsuite/tests/programs/galois_raytrace/Geometry.hs
index 8bca3a3e89..3c00f7b233 100644
--- a/testsuite/tests/programs/galois_raytrace/Geometry.hs
+++ b/testsuite/tests/programs/galois_raytrace/Geometry.hs
@@ -293,7 +293,7 @@ offsetToPoint (r,v) i = r `addPV` (i `multSV` v)
 
 --
 
-epsilon, inf :: Double      -- aproximate zero and infinity
+epsilon, inf :: Double      -- approximate zero and infinity
 epsilon = 1.0e-10
 inf = 1.0e20
 
diff --git a/testsuite/tests/simplCore/should_compile/T14137.hs b/testsuite/tests/simplCore/should_compile/T14137.hs
index ef8c307076..f8cbbc251a 100644
--- a/testsuite/tests/simplCore/should_compile/T14137.hs
+++ b/testsuite/tests/simplCore/should_compile/T14137.hs
@@ -1,7 +1,7 @@
 module T14137 where
 
 -- The point of this test is that we should inline 'thunk'
--- into j's RHS, and we can do so quite agressively, even
+-- into j's RHS, and we can do so quite aggressively, even
 -- when we aren't optimising. See the ticket.
 --
 -- It's not a big deal, because in the end FloatIn
diff --git a/testsuite/tests/simplCore/should_run/simplrun002.hs b/testsuite/tests/simplCore/should_run/simplrun002.hs
index ec4ea7c7ac..5b9e01cc25 100644
--- a/testsuite/tests/simplCore/should_run/simplrun002.hs
+++ b/testsuite/tests/simplCore/should_run/simplrun002.hs
@@ -12,11 +12,11 @@ import System.IO
 import System.IO.Unsafe ( unsafePerformIO )
 
 {-# NOINLINE [0] sndSnd #-}
--- Dont inline till last, to give the rule a chance
+-- Don't inline till last, to give the rule a chance
 sndSnd (a,(b,c)) = (a,c)
 
 {-# NOINLINE [2] myFst #-}
--- Dont inline till last, to give the rule a chance
+-- Don't inline till last, to give the rule a chance
 myFst (a,b) = a
 
 trace x y = unsafePerformIO (hPutStr stderr x >> hPutStr stderr "\n" >> return y)