[commit: ghc] master: Fix a popular typo in comments (d5fb670)
git at git.haskell.org
git at git.haskell.org
Sat Feb 1 20:28:33 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/d5fb6709df641010fb50bd120abd10257f4691b7/ghc
>---------------------------------------------------------------
commit d5fb6709df641010fb50bd120abd10257f4691b7
Author: Gabor Greif <ggreif at gmail.com>
Date: Sat Feb 1 21:26:23 2014 +0100
Fix a popular typo in comments
>---------------------------------------------------------------
d5fb6709df641010fb50bd120abd10257f4691b7
compiler/basicTypes/Demand.lhs | 2 +-
compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 2 +-
compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 2 +-
compiler/simplCore/Simplify.lhs | 2 +-
compiler/typecheck/TcGenDeriv.lhs | 2 +-
compiler/types/Type.lhs | 2 +-
docs/coding-style.html | 2 +-
docs/storage-mgt/rp.tex | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/compiler/basicTypes/Demand.lhs b/compiler/basicTypes/Demand.lhs
index 9607a15..e415c6d 100644
--- a/compiler/basicTypes/Demand.lhs
+++ b/compiler/basicTypes/Demand.lhs
@@ -960,7 +960,7 @@ this has a strictness signature of
meaning that "b2 `seq` ()" and "b2 1 `seq` ()" might well terminate, but
for "b2 1 2 `seq` ()" we get definite divergence.
-For comparision,
+For comparison,
b1 x = x `seq` error (show x)
has a strictness signature of
<S>b
diff --git a/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs b/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs
index df3c7d6..b5006ec 100644
--- a/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs
+++ b/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs
@@ -30,7 +30,7 @@ import Panic
-- (which are disjoint) ie. x86, x86_64 and ppc
--
-- The number of allocatable regs is hard coded in here so we can do
--- a fast comparision in trivColorable.
+-- a fast comparison in trivColorable.
--
-- It's ok if these numbers are _less_ than the actual number of free
-- regs, but they can't be more or the register conflict
diff --git a/compiler/nativeGen/SPARC/CodeGen/Gen32.hs b/compiler/nativeGen/SPARC/CodeGen/Gen32.hs
index 43b792a..df876b4 100644
--- a/compiler/nativeGen/SPARC/CodeGen/Gen32.hs
+++ b/compiler/nativeGen/SPARC/CodeGen/Gen32.hs
@@ -606,7 +606,7 @@ coerceFlt2Dbl x = do
-- Condition Codes -------------------------------------------------------------
--
--- Evaluate a comparision, and get the result into a register.
+-- Evaluate a comparison, and get the result into a register.
--
-- Do not fill the delay slots here. you will confuse the register allocator.
--
diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
index 3873ed3..129f6ef 100644
--- a/compiler/simplCore/Simplify.lhs
+++ b/compiler/simplCore/Simplify.lhs
@@ -1699,7 +1699,7 @@ This includes things like (==# a# b#)::Bool so that we simplify
to just
x
This particular example shows up in default methods for
-comparision operations (e.g. in (>=) for Int.Int32)
+comparison operations (e.g. in (>=) for Int.Int32)
Note [Case elimination: lifted case]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/compiler/typecheck/TcGenDeriv.lhs b/compiler/typecheck/TcGenDeriv.lhs
index 3852106..c8b203e 100644
--- a/compiler/typecheck/TcGenDeriv.lhs
+++ b/compiler/typecheck/TcGenDeriv.lhs
@@ -276,7 +276,7 @@ Several special cases:
Note [Do not rely on compare]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
It's a bad idea to define only 'compare', and build the other binary
-comparisions on top of it; see Trac #2130, #4019. Reason: we don't
+comparisons on top of it; see Trac #2130, #4019. Reason: we don't
want to laboriously make a three-way comparison, only to extract a
binary result, something like this:
(>) (I# x) (I# y) = case <# x y of
diff --git a/compiler/types/Type.lhs b/compiler/types/Type.lhs
index 0abe463..b8edc3e 100644
--- a/compiler/types/Type.lhs
+++ b/compiler/types/Type.lhs
@@ -1179,7 +1179,7 @@ seqTypes (ty:tys) = seqType ty `seq` seqTypes tys
%************************************************************************
%* *
- Comparision for types
+ Comparison for types
(We don't use instances so that we know where it happens)
%* *
%************************************************************************
diff --git a/docs/coding-style.html b/docs/coding-style.html
index 37aaf8d..6be9263 100644
--- a/docs/coding-style.html
+++ b/docs/coding-style.html
@@ -324,7 +324,7 @@ can be "polymorphic" as these examples show:
#define PROF_INFO(cl) (((StgClosure*)(cl))->header.profInfo)
// polymorphic case
- // but note that min(min(1,2),3) does 3 comparisions instead of 2!!
+ // but note that min(min(1,2),3) does 3 comparisons instead of 2!!
#define min(x,y) (((x)<=(y)) ? (x) : (y))
</pre>
diff --git a/docs/storage-mgt/rp.tex b/docs/storage-mgt/rp.tex
index 20e313b..0d841b9 100644
--- a/docs/storage-mgt/rp.tex
+++ b/docs/storage-mgt/rp.tex
@@ -1029,7 +1029,7 @@ execution of retainer profiling.
\label{fig-cacheprof}
\end{figure}
-\section{Comparision with nhc}
+\section{Comparison with nhc}
\section{Files}
More information about the ghc-commits
mailing list