diff options
author | Gabor Greif <ggreif@gmail.com> | 2015-07-30 17:06:33 +0200 |
---|---|---|
committer | Gabor Greif <ggreif@gmail.com> | 2015-07-30 17:20:51 +0200 |
commit | e9ad42da5aa8a6cab95461a8592e92ca08aa491a (patch) | |
tree | 18332ec66fb7658924d203af28682b835d008d02 | |
parent | 4f80ec0ee438800d95673a4898e69371957fed09 (diff) | |
download | haskell-e9ad42da5aa8a6cab95461a8592e92ca08aa491a.tar.gz |
Typos in comments and strings
Note: the haddock comment in TyCon.hs seems to be
garbled syntactically and grammatically
-rw-r--r-- | compiler/hsSyn/HsExpr.hs | 2 | ||||
-rw-r--r-- | compiler/typecheck/TcValidity.hs | 2 | ||||
-rw-r--r-- | compiler/types/TyCon.hs | 4 | ||||
-rw-r--r-- | docs/rts/rts.tex | 2 | ||||
-rw-r--r-- | 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 c81707dbc2..ecb4a02321 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 355341ad43..4dd9a5eb91 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 1cacf2e731..683c939a8a 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 158ae7e79a..809705e3d1 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 3ce24e4b3b..58dc1f3688 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 |