summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2017-05-23 12:08:25 +0200
committerGabor Greif <ggreif@gmail.com>2017-05-23 17:00:02 +0200
commit0b4b4a346e6922dafb073693593d55c7e87be9ca (patch)
tree0e9f72523430998b44225c7600999a983e971004
parenta29132e9248e39a45673b5c146341d9f4947dacd (diff)
downloadhaskell-0b4b4a346e6922dafb073693593d55c7e87be9ca.tar.gz
Typos in comments and manual [ci skip]
-rw-r--r--compiler/cmm/CmmUtils.hs2
-rw-r--r--compiler/coreSyn/TrieMap.hs2
-rw-r--r--compiler/rename/RnExpr.hs2
-rw-r--r--docs/users_guide/using-optimisation.rst4
-rw-r--r--mk/config.mk.in6
5 files changed, 8 insertions, 8 deletions
diff --git a/compiler/cmm/CmmUtils.hs b/compiler/cmm/CmmUtils.hs
index 1dab6eeff5..722718a3e2 100644
--- a/compiler/cmm/CmmUtils.hs
+++ b/compiler/cmm/CmmUtils.hs
@@ -510,7 +510,7 @@ toBlockListEntryFirst g
-- have both true and false successors. Block ordering can make a big difference
-- in performance in the LLVM backend. Note that we rely crucially on the order
-- of successors returned for CmmCondBranch by the NonLocal instance for CmmNode
--- defind in cmm/CmmNode.hs. -GBM
+-- defined in cmm/CmmNode.hs. -GBM
toBlockListEntryFirstFalseFallthrough :: CmmGraph -> [CmmBlock]
toBlockListEntryFirstFalseFallthrough g
| mapNull m = []
diff --git a/compiler/coreSyn/TrieMap.hs b/compiler/coreSyn/TrieMap.hs
index 308a9539ef..9058d03b57 100644
--- a/compiler/coreSyn/TrieMap.hs
+++ b/compiler/coreSyn/TrieMap.hs
@@ -446,7 +446,7 @@ Note [Binders]
rather than
cm_lam :: TypeMapG (CoreMapG a)
- * We don't need to look at the type of some binders, notalby
+ * We don't need to look at the type of some binders, notably
- the case binder in (Case _ b _ _)
- the binders in an alternative
because they are totally fixed by the context
diff --git a/compiler/rename/RnExpr.hs b/compiler/rename/RnExpr.hs
index cf0326e3bf..027f6dc178 100644
--- a/compiler/rename/RnExpr.hs
+++ b/compiler/rename/RnExpr.hs
@@ -833,7 +833,7 @@ rnStmt ctxt rnBody (L loc (BindStmt pat body _ _ _)) thing_inside
; xMonadFailEnabled <- fmap (xopt LangExt.MonadFailDesugaring) getDynFlags
; let getFailFunction
- -- If the pattern is irrefutible (e.g.: wildcard, tuple,
+ -- If the pattern is irrefutable (e.g.: wildcard, tuple,
-- ~pat, etc.) we should not need to fail.
| isIrrefutableHsPat pat
= return (noSyntaxExpr, emptyFVs)
diff --git a/docs/users_guide/using-optimisation.rst b/docs/users_guide/using-optimisation.rst
index cfecc349bb..1e74b71130 100644
--- a/docs/users_guide/using-optimisation.rst
+++ b/docs/users_guide/using-optimisation.rst
@@ -648,7 +648,7 @@ by saying ``-fno-wombat``.
:default: on
When solving constraints, try to eagerly solve
- super classes using availible dictionaries.
+ super classes using available dictionaries.
For example::
@@ -663,7 +663,7 @@ by saying ``-fno-wombat``.
constraint from the context because we have `C Int b` and that provides us
a
solution for `Num Int`. However, we can often produce much better code
- by directly solving for an availible `Num Int` dictionary we might have at
+ by directly solving for an available `Num Int` dictionary we might have at
hand. This removes potentially many layers of indirection and crucially
allows other optimisations to fire as the dictionary will be statically
known and selector functions can be inlined.
diff --git a/mk/config.mk.in b/mk/config.mk.in
index b2a9569d39..189439ec7c 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -893,7 +893,7 @@ GMP_LIB_DIRS = @GMP_LIB_DIRS@
CURSES_INCLUDE_DIRS = @CURSES_INCLUDE_DIRS@
CURSES_LIB_DIRS = @CURSES_LIB_DIRS@
-# See Note [Disable -O2 in unregisteride mode]
+# See Note [Disable -O2 in unregisterised mode]
# Be careful: 'GhcUnregisterised' should be defined earlier in this file.
ifeq "$(GhcUnregisterised)" "YES"
GhcStage1HcOpts=
@@ -903,8 +903,8 @@ GhcStage3HcOpts=
GhcLibHcOpts=
endif
-# Note [Disable -O2 in unregisteride mode]
-# Disable -O2 optimization in uregisterised more. Otherwise amount
+# Note [Disable -O2 in unregisterised mode]
+# Disable -O2 optimization in unregisterised mode. Otherwise amount
# of generated C code # makes things very slow to compile (~5 minutes
# on core-i7 for 'compiler/hsSyn/HsExpr.hs') and sometimes not compile
# at all: powerpc64 overflows TOC section on 'compiler/hsSyn/HsExpr.hs'