summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2017-02-23 17:01:07 +0100
committerGabor Greif <ggreif@gmail.com>2017-02-23 17:13:54 +0100
commit9a2a2aef1c84292cc51719ee36e12c5723554efe (patch)
treeb70535bb3ff548014e24970d634be03c8769c7f3
parent8a6b8c5fb96472d7c2e2cd1918950dd50f2fef71 (diff)
downloadhaskell-9a2a2aef1c84292cc51719ee36e12c5723554efe.tar.gz
Spelling only [ci skip]
-rw-r--r--compiler/basicTypes/Demand.hs2
-rw-r--r--compiler/basicTypes/MkId.hs2
-rw-r--r--compiler/codeGen/StgCmmExpr.hs2
-rw-r--r--compiler/coreSyn/CoreUnfold.hs2
-rw-r--r--compiler/coreSyn/CoreUtils.hs2
-rw-r--r--compiler/nativeGen/X86/CodeGen.hs2
-rw-r--r--compiler/parser/Lexer.x2
-rw-r--r--compiler/rename/RnSplice.hs2
-rw-r--r--compiler/typecheck/TcEnv.hs2
-rw-r--r--compiler/typecheck/TcExpr.hs2
-rw-r--r--compiler/typecheck/TcMatches.hs4
-rw-r--r--docs/storage-mgt/sm.tex2
-rw-r--r--docs/users_guide/using-warnings.rst2
-rw-r--r--libraries/base/System/Exit.hs2
-rw-r--r--rts/RaiseAsync.c2
15 files changed, 16 insertions, 16 deletions
diff --git a/compiler/basicTypes/Demand.hs b/compiler/basicTypes/Demand.hs
index 0e02809d61..71a044f51f 100644
--- a/compiler/basicTypes/Demand.hs
+++ b/compiler/basicTypes/Demand.hs
@@ -859,7 +859,7 @@ be unleashed. See also [Aggregated demand for cardinality].
Note [Replicating polymorphic demands]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Some demands can be considered as polymorphic. Generally, it is
-applicable to such beasts as tops, bottoms as well as Head-Used adn
+applicable to such beasts as tops, bottoms as well as Head-Used and
Head-stricts demands. For instance,
S ~ S(L, ..., L)
diff --git a/compiler/basicTypes/MkId.hs b/compiler/basicTypes/MkId.hs
index 8a204be421..b542f325cb 100644
--- a/compiler/basicTypes/MkId.hs
+++ b/compiler/basicTypes/MkId.hs
@@ -1141,7 +1141,7 @@ unsafeCoerceId
------------------------------------------------
nullAddrId :: Id
-- nullAddr# :: Addr#
--- The reason is is here is because we don't provide
+-- The reason it is here is because we don't provide
-- a way to write this literal in Haskell.
nullAddrId = pcMiscPrelId nullAddrName addrPrimTy info
where
diff --git a/compiler/codeGen/StgCmmExpr.hs b/compiler/codeGen/StgCmmExpr.hs
index 9e1d7fa37f..395e8d6fa6 100644
--- a/compiler/codeGen/StgCmmExpr.hs
+++ b/compiler/codeGen/StgCmmExpr.hs
@@ -693,7 +693,7 @@ cgConApp con stg_args
-- con args are always non-void,
-- see Note [Post-unarisation invariants] in UnariseStg
-- The first "con" says that the name bound to this
- -- closure is is "con", which is a bit of a fudge, but
+ -- closure is "con", which is a bit of a fudge, but
-- it only affects profiling (hence the False)
; emit =<< fcode_init
diff --git a/compiler/coreSyn/CoreUnfold.hs b/compiler/coreSyn/CoreUnfold.hs
index 71c5f0f870..bae6330e6d 100644
--- a/compiler/coreSyn/CoreUnfold.hs
+++ b/compiler/coreSyn/CoreUnfold.hs
@@ -1361,7 +1361,7 @@ AND
it is bound to a cheap expression
then we should not inline it (unless there is some other reason,
-e.g. is is the sole occurrence). That is what is happening at
+e.g. it is the sole occurrence). That is what is happening at
the use of 'lone_variable' in 'interesting_call'.
Why? At least in the case-scrutinee situation, turning
diff --git a/compiler/coreSyn/CoreUtils.hs b/compiler/coreSyn/CoreUtils.hs
index adc9acf018..dce7ef9aaf 100644
--- a/compiler/coreSyn/CoreUtils.hs
+++ b/compiler/coreSyn/CoreUtils.hs
@@ -2118,7 +2118,7 @@ tryEtaReduce bndrs body
{-
Note [Eta reduction of an eval'd function]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In Haskell is is not true that f = \x. f x
+In Haskell it is not true that f = \x. f x
because f might be bottom, and 'seq' can distinguish them.
But it *is* true that f = f `seq` \x. f x
diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs
index 72f8290057..877d822023 100644
--- a/compiler/nativeGen/X86/CodeGen.hs
+++ b/compiler/nativeGen/X86/CodeGen.hs
@@ -2594,7 +2594,7 @@ outOfLineCmmOp mop res args
where
-- Assume we can call these functions directly, and that they're not in a dynamic library.
-- TODO: Why is this ok? Under linux this code will be in libm.so
- -- Is is because they're really implemented as a primitive instruction by the assembler?? -- BL 2009/12/31
+ -- Is it because they're really implemented as a primitive instruction by the assembler?? -- BL 2009/12/31
lbl = mkForeignLabel fn Nothing ForeignLabelInThisPackage IsFunction
fn = case mop of
diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index 193943270c..3c5d98d054 100644
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@ -2800,7 +2800,7 @@ clean_pragma prag = canon_ws (map toLower (unprefix prag))
-- | Encapsulated call to addAnnotation, requiring only the SrcSpan of
-- the AST construct the annotation belongs to; together with the
--- AnnKeywordId, this is is the key of the annotation map
+-- AnnKeywordId, this is the key of the annotation map.
--
-- This type is useful for places in the parser where it is not yet
-- known what SrcSpan an annotation should be added to. The most
diff --git a/compiler/rename/RnSplice.hs b/compiler/rename/RnSplice.hs
index b927a898c8..2eeecd1f5f 100644
--- a/compiler/rename/RnSplice.hs
+++ b/compiler/rename/RnSplice.hs
@@ -195,7 +195,7 @@ illegalUntypedBracket =
quotedNameStageErr :: HsBracket RdrName -> SDoc
quotedNameStageErr br
= sep [ text "Stage error: the non-top-level quoted name" <+> ppr br
- , text "must be used at the same stage at which is is bound" ]
+ , text "must be used at the same stage at which it is bound" ]
{-
diff --git a/compiler/typecheck/TcEnv.hs b/compiler/typecheck/TcEnv.hs
index 7b19cd0311..bec62c8ad9 100644
--- a/compiler/typecheck/TcEnv.hs
+++ b/compiler/typecheck/TcEnv.hs
@@ -992,7 +992,7 @@ Consider
x = 3
data T = MkT $(foo x)
-where 'foo' is is imported from somewhere.
+where 'foo' is imported from somewhere.
This is really a staging error, because we can't run code involving 'x'.
But in fact the type checker processes types first, so 'x' won't even be
diff --git a/compiler/typecheck/TcExpr.hs b/compiler/typecheck/TcExpr.hs
index fe2bbab5cb..3d2a1058ac 100644
--- a/compiler/typecheck/TcExpr.hs
+++ b/compiler/typecheck/TcExpr.hs
@@ -338,7 +338,7 @@ tuple. The trouble is that this might accept a partially-applied
only going to work when it's fully applied, so it turns into
case x of _ -> (# p,q #)
-So it seems more uniform to treat 'seq' as it it was a language
+So it seems more uniform to treat 'seq' as if it was a language
construct.
See also Note [seqId magic] in MkId
diff --git a/compiler/typecheck/TcMatches.hs b/compiler/typecheck/TcMatches.hs
index 9a3add1f1d..e7deedee15 100644
--- a/compiler/typecheck/TcMatches.hs
+++ b/compiler/typecheck/TcMatches.hs
@@ -1029,7 +1029,7 @@ tcApplicativeStmts ctxt pairs rhs_ty thing_inside
; args' <- mapM goArg (zip3 args pat_tys exp_tys)
-- Bring into scope all the things bound by the args,
- -- and typecheck the thign_inside
+ -- and typecheck the thing_inside
-- See Note [ApplicativeDo and constraints]
; res <- tcExtendIdEnv (concatMap get_arg_bndrs args') $
thing_inside body_ty
@@ -1076,7 +1076,7 @@ tcApplicativeStmts ctxt pairs rhs_ty thing_inside
{- Note [ApplicativeDo and constraints]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
An applicative-do is supposed to take place in parallel, so
-constraints bound in one arm can't possibly be available in aother
+constraints bound in one arm can't possibly be available in another
(Trac #13242). Our current rule is this (more details and discussion
on the ticket). Consider
diff --git a/docs/storage-mgt/sm.tex b/docs/storage-mgt/sm.tex
index 679a4c1915..4a52d61f5b 100644
--- a/docs/storage-mgt/sm.tex
+++ b/docs/storage-mgt/sm.tex
@@ -823,7 +823,7 @@ The list @mut_once_list@ is also adjusted if it is safe to remove @r@ from
\subsubsection{(3) Scavenging CAFs}
-When a dynamically loaded CAF is entered, it it first put to the list
+When a dynamically loaded CAF is entered, it is first put to the list
@caf_list@ and then overwritten with a static indirection object.
The evaluation result of the CAF is stored in a dynamic object in the heap
and the static indirection object stores a pointer to the dynamic object.
diff --git a/docs/users_guide/using-warnings.rst b/docs/users_guide/using-warnings.rst
index 640855981a..21594ec262 100644
--- a/docs/users_guide/using-warnings.rst
+++ b/docs/users_guide/using-warnings.rst
@@ -836,7 +836,7 @@ of ``-W(no-)*``.
Will raise two warnings because ``Zero`` and ``Succ`` are not
written as ``'Zero`` and ``'Succ``.
- This warning is is enabled by default in :ghc-flag:`-Wall` mode.
+ This warning is enabled by default in :ghc-flag:`-Wall` mode.
.. ghc-flag:: -Wunused-binds
diff --git a/libraries/base/System/Exit.hs b/libraries/base/System/Exit.hs
index 2d0e6928ae..4f73665c0e 100644
--- a/libraries/base/System/Exit.hs
+++ b/libraries/base/System/Exit.hs
@@ -43,7 +43,7 @@ import GHC.IO.Exception
-- A program that fails in any other way is treated as if it had
-- called 'exitFailure'.
-- A program that terminates successfully without calling 'exitWith'
--- explicitly is treated as it it had called 'exitWith' 'ExitSuccess'.
+-- explicitly is treated as if it had called 'exitWith' 'ExitSuccess'.
--
-- As an 'ExitCode' is not an 'IOError', 'exitWith' bypasses
-- the error handling in the 'IO' monad and cannot be intercepted by
diff --git a/rts/RaiseAsync.c b/rts/RaiseAsync.c
index 256b7c565b..b399d41675 100644
--- a/rts/RaiseAsync.c
+++ b/rts/RaiseAsync.c
@@ -482,7 +482,7 @@ check_target:
#endif
case ThreadMigrating:
- // if is is ThreadMigrating and tso->cap is ours, then it
+ // if it is ThreadMigrating and tso->cap is ours, then it
// *must* be migrating *to* this capability. If it were
// migrating away from the capability, then tso->cap would
// point to the destination.