summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2014-01-26 13:39:00 +0100
committerGabor Greif <ggreif@gmail.com>2014-01-26 14:03:51 +0100
commit9005f91e2884b0db1f8b66b124708f65f7e69b90 (patch)
treedc7b694d55c3201b7946fcb3058a31289dff3913
parent5281dd6f5998af94aa06c3769089db7011ea4463 (diff)
downloadhaskell-9005f91e2884b0db1f8b66b124708f65f7e69b90.tar.gz
Squash some spelling issues
-rw-r--r--compiler/basicTypes/BasicTypes.lhs2
-rw-r--r--compiler/cmm/CmmContFlowOpt.hs2
-rw-r--r--compiler/coreSyn/CoreLint.lhs2
-rw-r--r--compiler/coreSyn/CoreSubst.lhs4
-rw-r--r--compiler/coreSyn/CoreSyn.lhs2
-rw-r--r--compiler/hsSyn/HsUtils.lhs2
-rw-r--r--compiler/rename/RnEnv.lhs4
-rw-r--r--compiler/rename/RnPat.lhs4
-rw-r--r--compiler/rename/RnSource.lhs2
-rw-r--r--compiler/simplCore/OccurAnal.lhs6
-rw-r--r--compiler/simplCore/SimplCore.lhs2
-rw-r--r--compiler/stgSyn/CoreToStg.lhs2
-rw-r--r--compiler/typecheck/TcMType.lhs2
-rw-r--r--docs/comm/exts/th.html2
-rw-r--r--docs/comm/the-beast/basicTypes.html2
-rw-r--r--docs/comm/the-beast/renamer.html2
-rw-r--r--docs/comm/the-beast/simplifier.html2
-rw-r--r--docs/comm/the-beast/stg.html4
-rw-r--r--docs/comm/the-beast/typecheck.html6
-rw-r--r--docs/ndp/haskell.sty2
-rw-r--r--docs/ndp/vect.tex2
-rw-r--r--docs/users_guide/glasgow_exts.xml2
22 files changed, 30 insertions, 30 deletions
diff --git a/compiler/basicTypes/BasicTypes.lhs b/compiler/basicTypes/BasicTypes.lhs
index cb90fc9979..9a92b003bc 100644
--- a/compiler/basicTypes/BasicTypes.lhs
+++ b/compiler/basicTypes/BasicTypes.lhs
@@ -566,7 +566,7 @@ defn of OccInfo here, safely at the bottom
\begin{code}
-- | Identifier occurrence information
data OccInfo
- = NoOccInfo -- ^ There are many occurrences, or unknown occurences
+ = NoOccInfo -- ^ There are many occurrences, or unknown occurrences
| IAmDead -- ^ Marks unused variables. Sometimes useful for
-- lambda and case-bound variables.
diff --git a/compiler/cmm/CmmContFlowOpt.hs b/compiler/cmm/CmmContFlowOpt.hs
index baef09fc00..52b95a93cc 100644
--- a/compiler/cmm/CmmContFlowOpt.hs
+++ b/compiler/cmm/CmmContFlowOpt.hs
@@ -246,7 +246,7 @@ blockConcat splitting_procs g@CmmGraph { g_entry = entry_id }
-- (3) increase number of predecessors of dest by 1
-- (4) decrease number of predecessors of b' by 1
--
- -- Later we will use replaceLabels to substitute all occurences of b'
+ -- Later we will use replaceLabels to substitute all occurrences of b'
-- with dest.
| splitting_procs
, Just b' <- callContinuation_maybe last
diff --git a/compiler/coreSyn/CoreLint.lhs b/compiler/coreSyn/CoreLint.lhs
index a2f312d4bd..836164e0ce 100644
--- a/compiler/coreSyn/CoreLint.lhs
+++ b/compiler/coreSyn/CoreLint.lhs
@@ -116,7 +116,7 @@ to the type of the binding variable. lintBinders does this.
For Ids, the type-substituted Id is added to the in_scope set (which
itself is part of the TvSubst we are carrying down), and when we
-find an occurence of an Id, we fetch it from the in-scope set.
+find an occurrence of an Id, we fetch it from the in-scope set.
\begin{code}
diff --git a/compiler/coreSyn/CoreSubst.lhs b/compiler/coreSyn/CoreSubst.lhs
index 3b39320381..fef3e86a2e 100644
--- a/compiler/coreSyn/CoreSubst.lhs
+++ b/compiler/coreSyn/CoreSubst.lhs
@@ -769,7 +769,7 @@ Note [Worker inlining]
A worker can get sustituted away entirely.
- it might be trivial
- it might simply be very small
-We do not treat an InlWrapper as an 'occurrence' in the occurence
+We do not treat an InlWrapper as an 'occurrence' in the occurrence
analyser, so it's possible that the worker is not even in scope any more.
In all all these cases we simply drop the special case, returning to
@@ -843,7 +843,7 @@ simpleOptExpr :: CoreExpr -> CoreExpr
-- We also inline bindings that bind a Eq# box: see
-- See Note [Optimise coercion boxes agressively].
--
--- The result is NOT guaranteed occurence-analysed, because
+-- The result is NOT guaranteed occurrence-analysed, because
-- in (let x = y in ....) we substitute for x; so y's occ-info
-- may change radically
diff --git a/compiler/coreSyn/CoreSyn.lhs b/compiler/coreSyn/CoreSyn.lhs
index 080c117f11..3dc8eeb31f 100644
--- a/compiler/coreSyn/CoreSyn.lhs
+++ b/compiler/coreSyn/CoreSyn.lhs
@@ -992,7 +992,7 @@ See also Note [Inlining an InlineRule] in CoreUnfold.
Note [OccInfo in unfoldings and rules]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In unfoldings and rules, we guarantee that the template is occ-analysed,
-so that the occurence info on the binders is correct. This is important,
+so that the occurrence info on the binders is correct. This is important,
because the Simplifier does not re-analyse the template when using it. If
the occurrence info is wrong
- We may get more simpifier iterations than necessary, because
diff --git a/compiler/hsSyn/HsUtils.lhs b/compiler/hsSyn/HsUtils.lhs
index abc4758fcb..558c104fad 100644
--- a/compiler/hsSyn/HsUtils.lhs
+++ b/compiler/hsSyn/HsUtils.lhs
@@ -701,7 +701,7 @@ hsLTyClDeclBinders :: Eq name => Located (TyClDecl name) -> [Located name]
-- ^ Returns all the /binding/ names of the decl.
-- The first one is guaranteed to be the name of the decl. For record fields
-- mentioned in multiple constructors, the SrcLoc will be from the first
--- occurence. We use the equality to filter out duplicate field names.
+-- occurrence. We use the equality to filter out duplicate field names.
--
-- Each returned (Located name) is wrapped in a @SrcSpan@ of the whole
-- /declaration/, not just the name itself (which is how it appears in
diff --git a/compiler/rename/RnEnv.lhs b/compiler/rename/RnEnv.lhs
index 1028d08f03..f0d1840970 100644
--- a/compiler/rename/RnEnv.lhs
+++ b/compiler/rename/RnEnv.lhs
@@ -450,7 +450,7 @@ Thus:
data G a
instance C S where
data G S = Y1 | Y2
-Even though there are two G's in scope (M.G and Blib.G), the occurence
+Even though there are two G's in scope (M.G and Blib.G), the occurrence
of 'G' in the 'instance C S' decl is unambiguous, because C has only
one associated type called G. This is exactly what happens for methods,
and it is only consistent to do the same thing for types. That's the
@@ -611,7 +611,7 @@ When the user writes:
'Zero' in the type signature of 'foo' is parsed as:
HsTyVar ("Zero", TcClsName)
-When the renamer hits this occurence of 'Zero' it's going to realise
+When the renamer hits this occurrence of 'Zero' it's going to realise
that it's not in scope. But because it is renaming a type, it knows
that 'Zero' might be a promoted data constructor, so it will demote
its namespace to DataName and do a second lookup.
diff --git a/compiler/rename/RnPat.lhs b/compiler/rename/RnPat.lhs
index 639ab51101..3fde563cd3 100644
--- a/compiler/rename/RnPat.lhs
+++ b/compiler/rename/RnPat.lhs
@@ -153,7 +153,7 @@ Consider
g _ = T1
-Arguaby we should report T2 as unused, even though it appears in a
+Arguably we should report T2 as unused, even though it appears in a
pattern, because it never occurs in a constructed position. See
Trac #7336.
However, implementing this in the face of pattern synonyms would be
@@ -166,7 +166,7 @@ we need to observe the dependency between P1 and P2 so that type
checking can be done in the correct order (just like for value
bindings). Dependencies between bindings is analyzed in the renamer,
where we don't know yet whether P2 is a constructor or a pattern
-synonym. So for now, we do report conid occurances in patterns as
+synonym. So for now, we do report conid occurrences in patterns as
uses.
%*********************************************************
diff --git a/compiler/rename/RnSource.lhs b/compiler/rename/RnSource.lhs
index f3b4d9178d..c726d554fc 100644
--- a/compiler/rename/RnSource.lhs
+++ b/compiler/rename/RnSource.lhs
@@ -60,7 +60,7 @@ for undefined tyvars, and tyvars in contexts that are ambiguous.
(Some of this checking has now been moved to module @TcMonoType@,
since we don't have functional dependency information at this point.)
\item
-Checks that all variable occurences are defined.
+Checks that all variable occurrences are defined.
\item
Checks the @(..)@ etc constraints in the export list.
\end{enumerate}
diff --git a/compiler/simplCore/OccurAnal.lhs b/compiler/simplCore/OccurAnal.lhs
index 3aacce64df..2487787c8d 100644
--- a/compiler/simplCore/OccurAnal.lhs
+++ b/compiler/simplCore/OccurAnal.lhs
@@ -72,7 +72,7 @@ occurAnalysePgm this_mod active_rule imp_rules vects vectVars binds
vectVars)
-- The RULES and VECTORISE declarations keep things alive! (For VECTORISE declarations,
-- we only get them *until* the vectoriser runs. Afterwards, these dependencies are
- -- reflected in 'vectors' — see Note [Vectorisation declarations and occurences].)
+ -- reflected in 'vectors' — see Note [Vectorisation declarations and occurrences].)
-- Note [Preventing loops due to imported functions rules]
imp_rules_edges = foldr (plusVarEnv_C unionVarSet) emptyVarEnv
@@ -92,7 +92,7 @@ occurAnalysePgm this_mod active_rule imp_rules vects vectVars binds
(final_usage, bind') = occAnalBind env env imp_rules_edges bind bs_usage
occurAnalyseExpr :: CoreExpr -> CoreExpr
- -- Do occurrence analysis, and discard occurence info returned
+ -- Do occurrence analysis, and discard occurrence info returned
occurAnalyseExpr = occurAnalyseExpr' True -- do binder swap
occurAnalyseExpr_NoBinderSwap :: CoreExpr -> CoreExpr
@@ -1657,7 +1657,7 @@ From the original
we will get
case x of cb(live) { p -> let x = cb in ...x... }
-Core Lint never expects to find an *occurence* of an Id marked
+Core Lint never expects to find an *occurrence* of an Id marked
as Dead, so we must zap the OccInfo on cb before making the
binding x = cb. See Trac #5028.
diff --git a/compiler/simplCore/SimplCore.lhs b/compiler/simplCore/SimplCore.lhs
index de562d5a97..c487c98491 100644
--- a/compiler/simplCore/SimplCore.lhs
+++ b/compiler/simplCore/SimplCore.lhs
@@ -628,7 +628,7 @@ simplifyPgmIO pass@(CoreDoSimplify max_iterations mode)
, sz == sz -- Force it
= do {
-- Occurrence analysis
- let { -- Note [Vectorisation declarations and occurences]
+ let { -- Note [Vectorisation declarations and occurrences]
-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- During the 'InitialPhase' (i.e., before vectorisation), we need to make sure
-- that the right-hand sides of vectorisation declarations are taken into
diff --git a/compiler/stgSyn/CoreToStg.lhs b/compiler/stgSyn/CoreToStg.lhs
index 9c5bc10293..2c4df6955f 100644
--- a/compiler/stgSyn/CoreToStg.lhs
+++ b/compiler/stgSyn/CoreToStg.lhs
@@ -1076,7 +1076,7 @@ type FreeVarsInfo = VarEnv (Var, HowBound, StgBinderInfo)
--
-- All case/lambda-bound things are also mapped to
-- noBinderInfo, since we aren't interested in their
- -- occurence info.
+ -- occurrence info.
--
-- For ILX we track free var info for type variables too;
-- hence VarEnv not IdEnv
diff --git a/compiler/typecheck/TcMType.lhs b/compiler/typecheck/TcMType.lhs
index 59dca2cb74..a40a93df16 100644
--- a/compiler/typecheck/TcMType.lhs
+++ b/compiler/typecheck/TcMType.lhs
@@ -546,7 +546,7 @@ zonkQuantifiedTyVar :: TcTyVar -> TcM TcTyVar
-- default their kind (e.g. from OpenTypeKind to TypeKind)
-- -- see notes with Kind.defaultKind
-- The meta tyvar is updated to point to the new skolem TyVar. Now any
--- bound occurences of the original type variable will get zonked to
+-- bound occurrences of the original type variable will get zonked to
-- the immutable version.
--
-- We leave skolem TyVars alone; they are immutable.
diff --git a/docs/comm/exts/th.html b/docs/comm/exts/th.html
index dbb168aa0e..539245db74 100644
--- a/docs/comm/exts/th.html
+++ b/docs/comm/exts/th.html
@@ -131,7 +131,7 @@ Core Language.Haskell.TH.Syntax.Type</pre>
appear.
</p>
- <h3>Binders Versus Occurences</h3>
+ <h3>Binders Versus Occurrences</h3>
<p>
Name lookups in the meta environment of the desugarer use two functions
with slightly different behaviour, namely <code>DsMeta.lookupOcc</code>
diff --git a/docs/comm/the-beast/basicTypes.html b/docs/comm/the-beast/basicTypes.html
index ca56d6b6a8..b411e4c5a9 100644
--- a/docs/comm/the-beast/basicTypes.html
+++ b/docs/comm/the-beast/basicTypes.html
@@ -41,7 +41,7 @@
<code>IdInfo</code>:
<p>
<dl>
- <dt><a name="occInfo">Occurence information</a>
+ <dt><a name="occInfo">Occurrence information</a>
<dd>The <code>OccInfo</code> data type is defined in the module <a
href="http://cvs.haskell.org/cgi-bin/cvsweb.cgi/fptools/ghc/compiler/basicTypes/BasicTypes.lhs"><code>BasicTypes.lhs</code></a>.
Apart from the trivial <code>NoOccInfo</code>, it distinguishes
diff --git a/docs/comm/the-beast/renamer.html b/docs/comm/the-beast/renamer.html
index 828b569bb9..878e82b370 100644
--- a/docs/comm/the-beast/renamer.html
+++ b/docs/comm/the-beast/renamer.html
@@ -194,7 +194,7 @@ data Provenance
<code>RdrName</code> environment, which contains <code>Name</code>s for
all imported <em>and</em> all locally defined toplevel binders. Hence,
when the helpers of <code>rnSrcDecls</code> come across the
- <em>defining</em> occurences of a toplevel <code>RdrName</code>, they
+ <em>defining</em> occurrences of a toplevel <code>RdrName</code>, they
don't rename it by generating a new name, but they simply look up its
name in the global <code>RdrName</code> environment.
</p>
diff --git a/docs/comm/the-beast/simplifier.html b/docs/comm/the-beast/simplifier.html
index 40cf7cf892..4dbce7765b 100644
--- a/docs/comm/the-beast/simplifier.html
+++ b/docs/comm/the-beast/simplifier.html
@@ -37,7 +37,7 @@
computes a set of <em>loop breakers</em> - a set of definitions that
together cut any possible loop in the binding group. It marks the
identifiers bound by these definitions as loop breakers by enriching
- their <a href="basicTypes.html#occInfo">occurence information.</a> Loop
+ their <a href="basicTypes.html#occInfo">occurrence information.</a> Loop
breakers will <em>never</em> be inlined by the simplifier; thus,
guaranteeing termination of the simplification procedure. (This is not
entirely accurate -- see <a href="#rules">rewrite rules</a> below.)
diff --git a/docs/comm/the-beast/stg.html b/docs/comm/the-beast/stg.html
index 4581da7d1f..6c9851623a 100644
--- a/docs/comm/the-beast/stg.html
+++ b/docs/comm/the-beast/stg.html
@@ -75,10 +75,10 @@
<p>
The representation of STG language defined in <a
href="http://cvs.haskell.org/cgi-bin/cvsweb.cgi/fptools/ghc/compiler/stgSyn/StgSyn.lhs"><code>StgSyn</code></a>
- abstracts over both binders and occurences of variables. The type names
+ abstracts over both binders and occurrences of variables. The type names
involved in this generic definition all carry the prefix
<code>Gen</code> (such as in <code>GenStgBinding</code>). Instances of
- these generic definitions, where both binders and occurences are of type
+ these generic definitions, where both binders and occurrences are of type
<a
href="http://cvs.haskell.org/cgi-bin/cvsweb.cgi/fptools/ghc/compiler/basicTypes/Id.lhs"><code>Id</code></a><code>.Id</code>
are defined as type synonyms and use type names that drop the
diff --git a/docs/comm/the-beast/typecheck.html b/docs/comm/the-beast/typecheck.html
index 8d22784b8a..482a447628 100644
--- a/docs/comm/the-beast/typecheck.html
+++ b/docs/comm/the-beast/typecheck.html
@@ -21,7 +21,7 @@
GHC defines the abstract syntax of Haskell programs in <a
href="http://cvs.haskell.org/cgi-bin/cvsweb.cgi/fptools/ghc/compiler/hsSyn/HsSyn.lhs"><code>HsSyn</code></a>
using a structure that abstracts over the concrete representation of
- bound occurences of identifiers and patterns. The module <a
+ bound occurrences of identifiers and patterns. The module <a
href="http://cvs.haskell.org/cgi-bin/cvsweb.cgi/fptools/ghc/compiler/typecheck/TcHsSyn.lhs"><code>TcHsSyn</code></a>
defines a number of helper function required by the type checker. Note
that the type <a
@@ -248,7 +248,7 @@ tau -> tyvar
Expressions are type checked by <a
href="http://cvs.haskell.org/cgi-bin/cvsweb.cgi/fptools/ghc/compiler/typecheck/TcExpr.lhs"><code>TcExpr</code>.</a>
<p>
- Usage occurences of identifiers are processed by the function
+ Usage occurrences of identifiers are processed by the function
<code>tcId</code> whose main purpose is to <a href="#inst">instantiate
overloaded identifiers.</a> It essentially calls
<code>TcInst.instOverloadedFun</code> once for each universally
@@ -275,7 +275,7 @@ tau -> tyvar
href="http://cvs.haskell.org/cgi-bin/cvsweb.cgi/fptools/ghc/compiler/typecheck/Inst.lhs"><code>Inst.lhs</code>.</a>
<p>
The function <code>instOverloadedFun</code> is invoked for each
- overloaded usage occurence of an identifier, where overloaded means that
+ overloaded usage occurrence of an identifier, where overloaded means that
the type of the idendifier contains a non-trivial type constraint. It
proceeds in two steps: (1) Allocation of a method instance
(<code>newMethodWithGivenTy</code>) and (2) instantiation of functional
diff --git a/docs/ndp/haskell.sty b/docs/ndp/haskell.sty
index 969ad673fe..3e4d478b1e 100644
--- a/docs/ndp/haskell.sty
+++ b/docs/ndp/haskell.sty
@@ -87,7 +87,7 @@
\ProvidesPackage{haskell}[2002/02/08 v1.1a Chilli's Haskell Style]
% NOTE: The sole purpose of the following is to work around what I believe is
-% a bug in LaTeX. If the first occurence of \mathit in a document uses
+% a bug in LaTeX. If the first occurrence of \mathit in a document uses
% \bgroup and \egroup to enclose the argument (instead of { and }),
% \mathit does *not* apply to the argument. (I guess, some font
% initialisation stuff is getting in the way of parsing the argument.)
diff --git a/docs/ndp/vect.tex b/docs/ndp/vect.tex
index 1244972374..cf6ee77ed0 100644
--- a/docs/ndp/vect.tex
+++ b/docs/ndp/vect.tex
@@ -243,7 +243,7 @@ Note that this is precisely the reason for the \<\parr{\cdot}\> instances for
\<\alpha\to\beta\> and \<PA \alpha\>. A term of type \<\forall\alpha.\sigma\>
will be lifted to a term of type
\<\parr{\forall\alpha.PA \alpha\to\vect{\sigma}}\> which requires the
-instances. Apart from closures, these are the only occurences of \<({\to})\> in
+instances. Apart from closures, these are the only occurrences of \<({\to})\> in
the transformed program, however.
diff --git a/docs/users_guide/glasgow_exts.xml b/docs/users_guide/glasgow_exts.xml
index 77be1e7bf6..23ba91cefd 100644
--- a/docs/users_guide/glasgow_exts.xml
+++ b/docs/users_guide/glasgow_exts.xml
@@ -1103,7 +1103,7 @@ pattern (Show b) => ExNumPat b :: (Num a, Eq a) => T a
<listitem> Matching:
<para>
-A pattern synonym occurance in a pattern is evaluated by first
+A pattern synonym occurrence in a pattern is evaluated by first
matching against the pattern synonym itself, and then on the argument
patterns. For example, in the following program, <literal>f</literal>
and <literal>f'</literal> are equivalent: