summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2017-01-05 11:41:44 +0100
committerGabor Greif <ggreif@gmail.com>2017-01-09 16:26:25 +0100
commita8a714ea6787f5717ca3ddf0f81ebba8d7ccca4d (patch)
treeb65d0e13c92aba0d9a5b34b6df3d9165c5cbee65
parent7d2e5da61714025142f0085d5ae150a61e637a5e (diff)
downloadhaskell-a8a714ea6787f5717ca3ddf0f81ebba8d7ccca4d.tar.gz
Typos in comments (and in a test)
-rw-r--r--compiler/coreSyn/CorePrep.hs2
-rw-r--r--compiler/simplCore/CallArity.hs6
-rw-r--r--compiler/simplCore/SimplUtils.hs2
-rw-r--r--compiler/simplStg/StgCse.hs2
-rw-r--r--compiler/typecheck/TcGenDeriv.hs2
-rw-r--r--compiler/utils/Digraph.hs6
-rw-r--r--libraries/base/Data/Traversable.hs2
-rw-r--r--libraries/base/GHC/Event/PSQ.hs2
-rw-r--r--libraries/compact/Data/Compact.hs2
-rw-r--r--testsuite/tests/programs/andy_cherry/andy_cherry.stdout2
-rw-r--r--testsuite/tests/programs/andy_cherry/mygames.pgn2
-rw-r--r--testsuite/tests/simplCore/should_compile/spec-inline.hs2
-rw-r--r--testsuite/tests/stranal/sigs/StrAnalExample.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/T12734a.hs2
14 files changed, 18 insertions, 18 deletions
diff --git a/compiler/coreSyn/CorePrep.hs b/compiler/coreSyn/CorePrep.hs
index 1547e85596..8f76200443 100644
--- a/compiler/coreSyn/CorePrep.hs
+++ b/compiler/coreSyn/CorePrep.hs
@@ -563,7 +563,7 @@ cpeRhsE env (Case scrut bndr ty alts)
cvtLitInteger :: DynFlags -> Id -> Maybe DataCon -> Integer -> CoreExpr
-- Here we convert a literal Integer to the low-level
--- represenation. Exactly how we do this depends on the
+-- representation. Exactly how we do this depends on the
-- library that implements Integer. If it's GMP we
-- use the S# data constructor for small literals.
-- See Note [Integer literals] in Literal
diff --git a/compiler/simplCore/CallArity.hs b/compiler/simplCore/CallArity.hs
index b703c07975..ffdd4b58af 100644
--- a/compiler/simplCore/CallArity.hs
+++ b/compiler/simplCore/CallArity.hs
@@ -342,7 +342,7 @@ For a mutually recursive let, we begin by
4. For each variable, we find out the incoming arity and whether it is called
once, based on the the current analysis result. If this differs from the
memoized results, we re-analyse the rhs and update the memoized table.
- 5. If nothing had to be reanalized, we are done.
+ 5. If nothing had to be reanalyzed, we are done.
Otherwise, repeat from step 3.
@@ -609,11 +609,11 @@ callArityBind boring_vars ae_body int b@(Rec binds)
| Just (old_called_once, old_arity, _) <- mbLastRun
, called_once == old_called_once
, new_arity == old_arity
- -- No change, no need to re-analize
+ -- No change, no need to re-analyze
= (False, (i, mbLastRun, rhs))
| otherwise
- -- We previously analized this with a different arity (or not at all)
+ -- We previously analyzed this with a different arity (or not at all)
= let is_thunk = not (exprIsCheap rhs) -- see note [What is a thunk]
safe_arity | is_thunk = 0 -- See Note [Thunks in recursive groups]
diff --git a/compiler/simplCore/SimplUtils.hs b/compiler/simplCore/SimplUtils.hs
index 5f600420ad..efda374363 100644
--- a/compiler/simplCore/SimplUtils.hs
+++ b/compiler/simplCore/SimplUtils.hs
@@ -1249,7 +1249,7 @@ ones that are trivial):
* The inliner should inline trivial things at call sites anyway.
* The Id might be exported. We could check for that separately,
- but since we aren't going to postInlineUnconditinoally /any/
+ but since we aren't going to postInlineUnconditionally /any/
top-level bindings, we don't need to test.
Note [Stable unfoldings and postInlineUnconditionally]
diff --git a/compiler/simplStg/StgCse.hs b/compiler/simplStg/StgCse.hs
index f09b823fe2..7454d24a2c 100644
--- a/compiler/simplStg/StgCse.hs
+++ b/compiler/simplStg/StgCse.hs
@@ -86,7 +86,7 @@ import Control.Monad( (>=>) )
-- The Trie --
--------------
--- A lookup trie for data constructor appliations, i.e.
+-- A lookup trie for data constructor applications, i.e.
-- keys of type `(DataCon, [StgArg])`, following the patterns in TrieMap.
data StgArgMap a = SAM
diff --git a/compiler/typecheck/TcGenDeriv.hs b/compiler/typecheck/TcGenDeriv.hs
index 84ee6a1f35..81bda8ec68 100644
--- a/compiler/typecheck/TcGenDeriv.hs
+++ b/compiler/typecheck/TcGenDeriv.hs
@@ -1494,7 +1494,7 @@ Example:
Note that (mkNameG_d "package-name" "ModuleName" "Foo") is equivalent to what
'Foo would be when using the -XTemplateHaskell extension. To make sure that
--XDeriveLift can be used on stage-1 compilers, however, we expliticly invoke
+-XDeriveLift can be used on stage-1 compilers, however, we explicitly invoke
makeG_d.
-}
diff --git a/compiler/utils/Digraph.hs b/compiler/utils/Digraph.hs
index 53173ba047..48e39f761f 100644
--- a/compiler/utils/Digraph.hs
+++ b/compiler/utils/Digraph.hs
@@ -103,7 +103,7 @@ emptyGraph = Graph (array (1, 0) []) (error "emptyGraph") (const Nothing)
graphFromEdgedVertices
:: ReduceFn key payload
-> [Node key payload] -- The graph; its ok for the
- -- out-list to contain keys which arent
+ -- out-list to contain keys which aren't
-- a vertex key, they are ignored
-> Graph (Node key payload)
graphFromEdgedVertices _reduceFn [] = emptyGraph
@@ -122,7 +122,7 @@ graphFromEdgedVertices reduceFn edged_vertices =
graphFromEdgedVerticesOrd
:: Ord key
=> [Node key payload] -- The graph; its ok for the
- -- out-list to contain keys which arent
+ -- out-list to contain keys which aren't
-- a vertex key, they are ignored
-> Graph (Node key payload)
graphFromEdgedVerticesOrd = graphFromEdgedVertices reduceNodesIntoVerticesOrd
@@ -132,7 +132,7 @@ graphFromEdgedVerticesOrd = graphFromEdgedVertices reduceNodesIntoVerticesOrd
graphFromEdgedVerticesUniq
:: Uniquable key
=> [Node key payload] -- The graph; its ok for the
- -- out-list to contain keys which arent
+ -- out-list to contain keys which aren't
-- a vertex key, they are ignored
-> Graph (Node key payload)
graphFromEdgedVerticesUniq = graphFromEdgedVertices reduceNodesIntoVerticesUniq
diff --git a/libraries/base/Data/Traversable.hs b/libraries/base/Data/Traversable.hs
index c166db5035..e525ba3231 100644
--- a/libraries/base/Data/Traversable.hs
+++ b/libraries/base/Data/Traversable.hs
@@ -208,7 +208,7 @@ that's all! We get
$fTraversable[]_$cmapM = ...code for traverse on lists...
with NO INLINE pragma! This happens even though 'traverse' had an
-INLINE pragma becuase the author knew it should be inlined pretty
+INLINE pragma because the author knew it should be inlined pretty
vigorously.
Indeed, it turned out that the rhs of $cmapM was just too big to
diff --git a/libraries/base/GHC/Event/PSQ.hs b/libraries/base/GHC/Event/PSQ.hs
index 311265fd80..b03bc9ce76 100644
--- a/libraries/base/GHC/Event/PSQ.hs
+++ b/libraries/base/GHC/Event/PSQ.hs
@@ -89,7 +89,7 @@ module GHC.Event.PSQ
) where
import GHC.Base hiding (empty)
-import GHC.Float () -- for Show Double instasnce
+import GHC.Float () -- for Show Double instance
import GHC.Num (Num(..))
import GHC.Show (Show(showsPrec))
import GHC.Event.Unique (Unique)
diff --git a/libraries/compact/Data/Compact.hs b/libraries/compact/Data/Compact.hs
index 85d1b623b4..42245c54f5 100644
--- a/libraries/compact/Data/Compact.hs
+++ b/libraries/compact/Data/Compact.hs
@@ -55,7 +55,7 @@ getCompact (Compact _ obj _) = obj
--
-- If the structure contains any internal sharing, the shared data
-- will be duplicated during the compaction process. Loops if the
--- structure constains cycles.
+-- structure contains cycles.
--
-- The NFData constraint is just to ensure that the object contains no
-- functions, 'compact' does not actually use it. If your object
diff --git a/testsuite/tests/programs/andy_cherry/andy_cherry.stdout b/testsuite/tests/programs/andy_cherry/andy_cherry.stdout
index a113f63a15..b61d2da4d7 100644
--- a/testsuite/tests/programs/andy_cherry/andy_cherry.stdout
+++ b/testsuite/tests/programs/andy_cherry/andy_cherry.stdout
@@ -7196,7 +7196,7 @@ $$\showboard$$
25 & Qf3&\\
\end{tabular}}|
\end{center}
-Crude plan of exchanging queens to avoid `acidents`.
+Crude plan of exchanging queens to avoid `accidents`.
|25.~Bb3|
\begin{center}|
{\bf\begin{tabular}{rp{50pt}p{50pt}}
diff --git a/testsuite/tests/programs/andy_cherry/mygames.pgn b/testsuite/tests/programs/andy_cherry/mygames.pgn
index 19194cf0a0..d90a9e1b1b 100644
--- a/testsuite/tests/programs/andy_cherry/mygames.pgn
+++ b/testsuite/tests/programs/andy_cherry/mygames.pgn
@@ -1313,7 +1313,7 @@ is starting to push home his advantage.}) 19. Kxg2 Bh3+ 20. Kh1 Qg4 (
21. Ne1 Qg5 22. Qe2 Be6 23. Rg3 Qf6 24. Nxe6 {} (24. Nf3 Ne7 25. Nxe6
Qxe6 26. Bb3 Qf6 27. Rag1 {<waw>}) 24... Rxe6 (24... Qxe6 25. Bb3 Qe7
26. Bd5 Rad8 27. Nf3 R8d7 28. Rd1) 25. Qf3 {Crude plan of exchanging
-queens to avoid `acidents`.} (25. Bb3) 25... Qe7 26. Bb3 Rf6 27. Qe3 (27.
+queens to avoid `accidents`.} (25. Bb3) 25... Qe7 26. Bb3 Rf6 27. Qe3 (27.
Qg2) 27... Rd8 28. Nc2 Kh7 29. Rag1 g6 30. Rf3 {} 30... Rxf3 (30... Rfd6 {
??} 31. Rxf7+ {Trying to avoid the exchance, but black loses his Queen!
Black actually moved his rook to d6, but before letting it go, spotted
diff --git a/testsuite/tests/simplCore/should_compile/spec-inline.hs b/testsuite/tests/simplCore/should_compile/spec-inline.hs
index 6c690ea12e..17f470f6f0 100644
--- a/testsuite/tests/simplCore/should_compile/spec-inline.hs
+++ b/testsuite/tests/simplCore/should_compile/spec-inline.hs
@@ -1,4 +1,4 @@
-{- This test checks that specialiations can apply inside
+{- This test checks that specialisations can apply inside
wrappers. In particular, the wrapper for 'foo' should
look like
diff --git a/testsuite/tests/stranal/sigs/StrAnalExample.hs b/testsuite/tests/stranal/sigs/StrAnalExample.hs
index 0ac61b9bfb..10b42f38be 100644
--- a/testsuite/tests/stranal/sigs/StrAnalExample.hs
+++ b/testsuite/tests/stranal/sigs/StrAnalExample.hs
@@ -1,4 +1,4 @@
--- Just an example on how to create tests that test the strictness analizer
+-- Just an example on how to create tests that test the strictness analyzer
module StrAnalExample where
diff --git a/testsuite/tests/typecheck/should_compile/T12734a.hs b/testsuite/tests/typecheck/should_compile/T12734a.hs
index 01ae2a6255..38f7307f1a 100644
--- a/testsuite/tests/typecheck/should_compile/T12734a.hs
+++ b/testsuite/tests/typecheck/should_compile/T12734a.hs
@@ -93,7 +93,7 @@ test_ghc_err = test_gr @(KT A '[Type] IO)
= Con m (Stack lrs (Layer4 bind))
--> inline lrs
[W] Con m (Stack '[Type] (Layer4 bind))
---> isntance
+--> instance
[W] Con m (Stack '[] bind)
--> Monad m
+