summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2017-10-17 13:44:13 +0200
committerGabor Greif <ggreif@gmail.com>2017-10-17 14:05:29 +0200
commit2f436151f4810b67d10c7d208fa81bef6e53d490 (patch)
treeb4bb9485f86708bccc1f41bfc3437822f00e0a3d
parented48d133f9b9e41ea6d5dc254f257eeb12ad00b7 (diff)
downloadhaskell-2f436151f4810b67d10c7d208fa81bef6e53d490.tar.gz
Fix grammaros in comments
-rw-r--r--compiler/simplCore/CSE.hs2
-rw-r--r--compiler/stranal/DmdAnal.hs2
-rw-r--r--docs/users_guide/debugging.rst2
-rw-r--r--libraries/ghc-boot/GHC/PackageDb.hs2
4 files changed, 4 insertions, 4 deletions
diff --git a/compiler/simplCore/CSE.hs b/compiler/simplCore/CSE.hs
index 16dd64cceb..65b9af91f2 100644
--- a/compiler/simplCore/CSE.hs
+++ b/compiler/simplCore/CSE.hs
@@ -213,7 +213,7 @@ WorkWrap (see Note [Wrapper activation]). We can tell because noUserInlineSpec
is then true.
Note that we do not (currently) do CSE on the unfolding stored inside
-an Id, even if is a 'stable' unfolding. That means that when an
+an Id, even if it is a 'stable' unfolding. That means that when an
unfolding happens, it is always faithful to what the stable unfolding
originally was.
diff --git a/compiler/stranal/DmdAnal.hs b/compiler/stranal/DmdAnal.hs
index 44adc81633..77da307263 100644
--- a/compiler/stranal/DmdAnal.hs
+++ b/compiler/stranal/DmdAnal.hs
@@ -401,7 +401,7 @@ situation actually arises in GHC.IO.Handle.Internals.wantReadableHandle
So if the scrutinee is a primop call, we *don't* apply the
state hack:
- - If is a simple, terminating one like getMaskingState,
+ - If it is a simple, terminating one like getMaskingState,
applying the hack is over-conservative.
- If the primop is raise# then it returns bottom, so
the case alternatives are already discarded.
diff --git a/docs/users_guide/debugging.rst b/docs/users_guide/debugging.rst
index 52abd74f25..0096c71157 100644
--- a/docs/users_guide/debugging.rst
+++ b/docs/users_guide/debugging.rst
@@ -49,7 +49,7 @@ Dumping out compiler intermediate structures
be a bit more eager in forcing pass results to more accurately account for
their costs.
- Two types of messages are produced: Those beginning with ``***`` are
+ Two types of messages are produced: Those beginning with ``***`` do
denote the beginning of a compilation phase whereas those starting with
``!!!`` mark the end of a pass and are accompanied by allocation and
runtime statistics.
diff --git a/libraries/ghc-boot/GHC/PackageDb.hs b/libraries/ghc-boot/GHC/PackageDb.hs
index a59c46e585..e2e4694308 100644
--- a/libraries/ghc-boot/GHC/PackageDb.hs
+++ b/libraries/ghc-boot/GHC/PackageDb.hs
@@ -249,7 +249,7 @@ lockPackageDbWith mode file = do
-- opened for write access. We would previously try opening the lockfile for
-- read-only access first, however this failed when run on such filesystems.
-- Consequently, we now try read-write access first, falling back to read-only
- -- if are denied permission (e.g. in the case of a global database).
+ -- if we are denied permission (e.g. in the case of a global database).
catchJust
(\e -> if isPermissionError e then Just () else Nothing)
(lockFileOpenIn ReadWriteMode)