[commit: ghc] master: Typos in comments (c9a0228)

git at git.haskell.org git at git.haskell.org
Wed Dec 17 12:27:00 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c9a02287a5cd14b71ac8a97711e018e9daa0abfc/ghc

>---------------------------------------------------------------

commit c9a02287a5cd14b71ac8a97711e018e9daa0abfc
Author: Gabor Greif <ggreif at gmail.com>
Date:   Wed Dec 17 12:36:07 2014 +0100

    Typos in comments


>---------------------------------------------------------------

c9a02287a5cd14b71ac8a97711e018e9daa0abfc
 compiler/codeGen/StgCmmMonad.hs                 | 2 +-
 testsuite/tests/codeGen/should_compile/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/codeGen/StgCmmMonad.hs b/compiler/codeGen/StgCmmMonad.hs
index fff8e28..f7a13f9 100644
--- a/compiler/codeGen/StgCmmMonad.hs
+++ b/compiler/codeGen/StgCmmMonad.hs
@@ -285,7 +285,7 @@ data ReturnKind
 -- clean up.
 --
 -- There are some rarer cases of common blocks that we don't catch
--- this way, but that's ok.  Common-block-elimation is still available
+-- this way, but that's ok.  Common-block-elimination is still available
 -- to catch them when optimisation is enabled.  Some examples are:
 --
 --   - when both the True and False branches do a heap check, we
diff --git a/testsuite/tests/codeGen/should_compile/Makefile b/testsuite/tests/codeGen/should_compile/Makefile
index b186e0d..412c902 100644
--- a/testsuite/tests/codeGen/should_compile/Makefile
+++ b/testsuite/tests/codeGen/should_compile/Makefile
@@ -19,8 +19,8 @@ debug:
 		> debug.cmm
 	cat debug.cmm | grep -o src\<debug.hs:.*\> | sort -u
 
-	# Common block elimination should elimation should merge the
-	# blocks corresponding to alternatives 1 and 2, therefore there
+	# Common block elimination should merge the blocks
+	# corresponding to alternatives 1 and 2, therefore there
 	# must be a block containing exactly these two annotations
 	# directly next to each other.
 	echo == CBE ==



More information about the ghc-commits mailing list