[commit: ghc] master: Random typo fixes (3dd06d5)
git at git.haskell.org
git at git.haskell.org
Thu Dec 17 23:31:16 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/3dd06d5e710f1c64268eec2587c57bad46080636/ghc
>---------------------------------------------------------------
commit 3dd06d5e710f1c64268eec2587c57bad46080636
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date: Thu Dec 17 23:59:59 2015 +0100
Random typo fixes
[skip ci]
>---------------------------------------------------------------
3dd06d5e710f1c64268eec2587c57bad46080636
compiler/cmm/CmmParse.y | 2 +-
compiler/coreSyn/CoreArity.hs | 2 +-
compiler/coreSyn/CoreUtils.hs | 2 +-
compiler/iface/IfaceSyn.hs | 2 +-
compiler/main/Elf.hs | 2 +-
docs/stg-spec/stg-spec.mng | 2 +-
docs/users_guide/editing-guide.rst | 2 +-
includes/rts/Constants.h | 2 +-
libraries/ghci/GHCi/Message.hs | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y
index 8aa3a79..2cbb7b2 100644
--- a/compiler/cmm/CmmParse.y
+++ b/compiler/cmm/CmmParse.y
@@ -192,7 +192,7 @@ where info_ptr and field1..fieldN describe the stack frame, and
arg1..argN are the arguments passed to f using the NativeNodeCall
convention. Note if a field is longer than a word (e.g. a D_ on
a 32-bit machine) then the call will push as many words as
-necessary to the stack to accomodate it (e.g. 2).
+necessary to the stack to accommodate it (e.g. 2).
----------------------------------------------------------------------------- -}
diff --git a/compiler/coreSyn/CoreArity.hs b/compiler/coreSyn/CoreArity.hs
index e832f54..0f392ae 100644
--- a/compiler/coreSyn/CoreArity.hs
+++ b/compiler/coreSyn/CoreArity.hs
@@ -440,7 +440,7 @@ ArityType 'at', then
assuming the calls of f respect the one-shot-ness of
its definition.
- NB 'f' is an arbitary expression, eg (f = g e1 e2). This 'f'
+ NB 'f' is an arbitrary expression, eg (f = g e1 e2). This 'f'
can have ArityType as ATop, with length as > 0, only if e1 e2 are
themselves.
diff --git a/compiler/coreSyn/CoreUtils.hs b/compiler/coreSyn/CoreUtils.hs
index 059abf1..9d887ec 100644
--- a/compiler/coreSyn/CoreUtils.hs
+++ b/compiler/coreSyn/CoreUtils.hs
@@ -539,7 +539,7 @@ trimConArgs :: AltCon -> [CoreArg] -> [CoreArg]
-- > C b x y -> ...
--
-- We want to drop the leading type argument of the scrutinee
--- leaving the arguments to match agains the pattern
+-- leaving the arguments to match against the pattern
trimConArgs DEFAULT args = ASSERT( null args ) []
trimConArgs (LitAlt _) args = ASSERT( null args ) []
diff --git a/compiler/iface/IfaceSyn.hs b/compiler/iface/IfaceSyn.hs
index 247566c..b5929e0 100644
--- a/compiler/iface/IfaceSyn.hs
+++ b/compiler/iface/IfaceSyn.hs
@@ -80,7 +80,7 @@ infixl 3 &&&
-}
type IfaceTopBndr = OccName
- -- It's convenient to have an OccName in the IfaceSyn, altough in each
+ -- It's convenient to have an OccName in the IfaceSyn, although in each
-- case the namespace is implied by the context. However, having an
-- OccNames makes things like ifaceDeclImplicitBndrs and ifaceDeclFingerprints
-- very convenient.
diff --git a/compiler/main/Elf.hs b/compiler/main/Elf.hs
index 6dd1019..50f11a7 100644
--- a/compiler/main/Elf.hs
+++ b/compiler/main/Elf.hs
@@ -36,7 +36,7 @@ import qualified Data.ByteString.Lazy.Char8 as B8
ELF (Executable and Linking Format) is described in the System V Application
Binary Interface (or ABI). The latter is composed of two parts: a generic
part and a processor specific part. The generic ABI describes the parts of
- the interface that remain constant accross all hardware implementations of
+ the interface that remain constant across all hardware implementations of
System V.
The latest release of the specification of the generic ABI is the version
diff --git a/docs/stg-spec/stg-spec.mng b/docs/stg-spec/stg-spec.mng
index cf8a716..ce5ca3f 100644
--- a/docs/stg-spec/stg-spec.mng
+++ b/docs/stg-spec/stg-spec.mng
@@ -132,7 +132,7 @@ acts as a pointer to the value on the heap.
\gram{\ottheap}
Execution procedes until a return value (a literal or a variable, i.e.
-pointer to the heap) is produced. To accomodate for let-no-escape
+pointer to the heap) is produced. To accommodate for let-no-escape
bindings, we also allow execution to terminate with a jump to a function
application of a let-no-escape variable.
diff --git a/docs/users_guide/editing-guide.rst b/docs/users_guide/editing-guide.rst
index 64db781..ff3d4b8 100644
--- a/docs/users_guide/editing-guide.rst
+++ b/docs/users_guide/editing-guide.rst
@@ -91,7 +91,7 @@ The above would be rendered as,
Headings
~~~~~~~~
-While ReST can accomodate a wide range of heading styles, we have standardized
+While ReST can accommodate a wide range of heading styles, we have standardized
on this convention in the User's Guide,
.. code-block:: rest
diff --git a/includes/rts/Constants.h b/includes/rts/Constants.h
index 02cb632..6e44410 100644
--- a/includes/rts/Constants.h
+++ b/includes/rts/Constants.h
@@ -115,7 +115,7 @@
How much Haskell stack space to reserve for the saving of registers
etc. in the case of a stack/heap overflow.
- This must be large enough to accomodate the largest stack frame
+ This must be large enough to accommodate the largest stack frame
pushed in one of the heap check fragments in HeapStackCheck.hc
(ie. currently the generic heap checks - 3 words for StgRetDyn,
18 words for the saved registers, see StgMacros.h).
diff --git a/libraries/ghci/GHCi/Message.hs b/libraries/ghci/GHCi/Message.hs
index bdf29cb..0d28c68 100644
--- a/libraries/ghci/GHCi/Message.hs
+++ b/libraries/ghci/GHCi/Message.hs
@@ -208,7 +208,7 @@ instance Binary a => Binary (EvalResult a)
--
-- * We print them, e.g. "*** Exception: <something>"
-- * UserInterrupt has a special meaning
--- * In ghc -e, exitWith should exit with the appropraite exit code
+-- * In ghc -e, exitWith should exit with the appropriate exit code
--
-- So all we need to do is distinguish UserInterrupt and ExitCode, and
-- all other exceptions can be represented by their 'show' string.
More information about the ghc-commits
mailing list