[commit: ghc] master: Typos in comments and strings (e9ad42d)

git at git.haskell.org git at git.haskell.org
Thu Jul 30 15:22:24 UTC 2015


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

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

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

commit e9ad42da5aa8a6cab95461a8592e92ca08aa491a
Author: Gabor Greif <ggreif at gmail.com>
Date:   Thu Jul 30 17:06:33 2015 +0200

    Typos in comments and strings
    
    Note: the haddock comment in TyCon.hs seems to be
          garbled syntactically and grammatically


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

e9ad42da5aa8a6cab95461a8592e92ca08aa491a
 compiler/hsSyn/HsExpr.hs                         | 2 +-
 compiler/typecheck/TcValidity.hs                 | 2 +-
 compiler/types/TyCon.hs                          | 4 ++--
 docs/rts/rts.tex                                 | 2 +-
 testsuite/tests/programs/galois_raytrace/Eval.hs | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/hsSyn/HsExpr.hs b/compiler/hsSyn/HsExpr.hs
index c81707d..ecb4a02 100644
--- a/compiler/hsSyn/HsExpr.hs
+++ b/compiler/hsSyn/HsExpr.hs
@@ -1267,7 +1267,7 @@ data StmtLR idL idR body -- body should always be (LHs**** idR)
                body
                (SyntaxExpr idR)   -- The return operator, used only for MonadComp
                                   -- For ListComp, PArrComp, we use the baked-in 'return'
-                                  -- For DoExpr, MDoExpr, we don't appply a 'return' at all
+                                  -- For DoExpr, MDoExpr, we don't apply a 'return' at all
                                   -- See Note [Monad Comprehensions]
   -- | - 'ApiAnnotation.AnnKeywordId' : 'ApiAnnotation.AnnLarrow'
 
diff --git a/compiler/typecheck/TcValidity.hs b/compiler/typecheck/TcValidity.hs
index 355341a..4dd9a5e 100644
--- a/compiler/typecheck/TcValidity.hs
+++ b/compiler/typecheck/TcValidity.hs
@@ -168,7 +168,7 @@ Only a *class* predicate can give rise to ambiguity
 An *implicit parameter* cannot.  For example:
         foo :: (?x :: [a]) => Int
         foo = length ?x
-is fine.  The call site will suppply a particular 'x'
+is fine.  The call site will supply a particular 'x'
 
 Furthermore, the type variables fixed by an implicit parameter
 propagate to the others.  E.g.
diff --git a/compiler/types/TyCon.hs b/compiler/types/TyCon.hs
index 1cacf2e..683c939 100644
--- a/compiler/types/TyCon.hs
+++ b/compiler/types/TyCon.hs
@@ -1402,8 +1402,8 @@ isDataFamilyTyCon :: TyCon -> Bool
 isDataFamilyTyCon (AlgTyCon {algTcRhs = DataFamilyTyCon {}}) = True
 isDataFamilyTyCon _ = False
 
--- | Are we able to extract informationa 'TyVar' to class argument list
--- mappping from a given 'TyCon'?
+-- | Are we able to extract information 'TyVar' to class argument list
+-- mapping from a given 'TyCon'?
 isTyConAssoc :: TyCon -> Bool
 isTyConAssoc tc = isJust (tyConAssoc_maybe tc)
 
diff --git a/docs/rts/rts.tex b/docs/rts/rts.tex
index 158ae7e..809705e 100644
--- a/docs/rts/rts.tex
+++ b/docs/rts/rts.tex
@@ -4428,7 +4428,7 @@ while (threads_exist) {
   do {
     // enter object on top of stack
     // if the top object is a BCO, we must enter it
-    // otherwise appply any heuristic we wish.
+    // otherwise apply any heuristic we wish.
     if (thread->stack[thread->sp]->info.type == BCO) {
 	status = runHugs(thread,&smInfo);
     } else {
diff --git a/testsuite/tests/programs/galois_raytrace/Eval.hs b/testsuite/tests/programs/galois_raytrace/Eval.hs
index 3ce24e4..58dc1f3 100644
--- a/testsuite/tests/programs/galois_raytrace/Eval.hs
+++ b/testsuite/tests/programs/galois_raytrace/Eval.hs
@@ -325,7 +325,7 @@ mainEval prog = do { stk <- eval (State emptyEnv [] prog)
                              }
 -}
 
-done = "Items still on stack at (successfull) termination of program"
+done = "Items still on stack at (successful) termination of program"
 
 ------------------------------------------------------------------------------
 -- testing



More information about the ghc-commits mailing list