[commit: ghc] master: Typos in comments [skip ci] (4e7d835)

[git at git.haskell.org]

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

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

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

commit 4e7d8350a10167a7de8dd4d9ffd3a21194177c39
Author: Gabor Greif <ggreif at gmail.com>
Date:   Tue Jun 21 16:11:10 2016 +0200

    Typos in comments [skip ci]


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

4e7d8350a10167a7de8dd4d9ffd3a21194177c39
 compiler/basicTypes/MkId.hs                               | 2 +-
 compiler/coreSyn/CoreLint.hs                              | 2 +-
 compiler/simplCore/OccurAnal.hs                           | 2 +-
 compiler/simplCore/Simplify.hs                            | 2 +-
 compiler/specialise/Specialise.hs                         | 4 ++--
 testsuite/tests/dependent/should_compile/dynamic-paper.hs | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/basicTypes/MkId.hs b/compiler/basicTypes/MkId.hs
index e146c66..99a4d25 100644
--- a/compiler/basicTypes/MkId.hs
+++ b/compiler/basicTypes/MkId.hs
@@ -393,7 +393,7 @@ mkDataConWorkId wkr_name data_con
         -- the simplifier thinks that y is "sure to be evaluated" (because
         --  $wMkT is strict) and drops the case.  No, $wMkT is not strict.
         --
-        -- When the simplifer sees a pattern
+        -- When the simplifier sees a pattern
         --      case e of MkT x -> ...
         -- it uses the dataConRepStrictness of MkT to mark x as evaluated;
         -- but that's fine... dataConRepStrictness comes from the data con
diff --git a/compiler/coreSyn/CoreLint.hs b/compiler/coreSyn/CoreLint.hs
index d905b8c..06e45830 100644
--- a/compiler/coreSyn/CoreLint.hs
+++ b/compiler/coreSyn/CoreLint.hs
@@ -891,7 +891,7 @@ checkCaseAlts :: CoreExpr -> OutType -> [CoreAlt] -> LintM ()
 -- b2) Check that the others are in increasing order
 -- c) Check that there's a default for infinite types
 -- NB: Algebraic cases are not necessarily exhaustive, because
---     the simplifer correctly eliminates case that can't
+--     the simplifier correctly eliminates case that can't
 --     possibly match.
 
 checkCaseAlts e ty alts =
diff --git a/compiler/simplCore/OccurAnal.hs b/compiler/simplCore/OccurAnal.hs
index 33e0c45..2efd82f 100644
--- a/compiler/simplCore/OccurAnal.hs
+++ b/compiler/simplCore/OccurAnal.hs
@@ -958,7 +958,7 @@ reOrderNodes depth bndr_set weak_fvs (node : nodes) binds
         | otherwise = 0
 
         -- Checking for a constructor application
-        -- Cheap and cheerful; the simplifer moves casts out of the way
+        -- Cheap and cheerful; the simplifier moves casts out of the way
         -- The lambda case is important to spot x = /\a. C (f a)
         -- which comes up when C is a dictionary constructor and
         -- f is a default method.
diff --git a/compiler/simplCore/Simplify.hs b/compiler/simplCore/Simplify.hs
index 6e6a6aa..bd0c8a9 100644
--- a/compiler/simplCore/Simplify.hs
+++ b/compiler/simplCore/Simplify.hs
@@ -2320,7 +2320,7 @@ knownCon env scrut dc dc_ty_args dc_args bndr bs rhs cont
 -------------------
 missingAlt :: SimplEnv -> Id -> [InAlt] -> SimplCont -> SimplM (SimplEnv, OutExpr)
                 -- This isn't strictly an error, although it is unusual.
-                -- It's possible that the simplifer might "see" that
+                -- It's possible that the simplifier might "see" that
                 -- an inner case has no accessible alternatives before
                 -- it "sees" that the entire branch of an outer case is
                 -- inaccessible.  So we simply put an error case here instead.
diff --git a/compiler/specialise/Specialise.hs b/compiler/specialise/Specialise.hs
index abd15c8..644ecc7 100644
--- a/compiler/specialise/Specialise.hs
+++ b/compiler/specialise/Specialise.hs
@@ -398,7 +398,7 @@ Seems quite reasonable.  Similar things could be done with instance decls:
 Ho hum.  Things are complex enough without this.  I pass.
 
 
-Requirements for the simplifer
+Requirements for the simplifier
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The simplifier has to be able to take advantage of the specialisation.
 
@@ -1356,7 +1356,7 @@ crash. So we use Refl right off the bat, and do not forall-quantify 'g':
  * exprsFreeIdsList returns the Ids bound by the args,
    which won't include g
 
-You might wonder if this will match as often, but the simplifer replaces
+You might wonder if this will match as often, but the simplifier replaces
 complicated Refl coercions with Refl pretty aggressively.
 
 Note [Orphans and auto-generated rules]
diff --git a/testsuite/tests/dependent/should_compile/dynamic-paper.hs b/testsuite/tests/dependent/should_compile/dynamic-paper.hs
index 8381552..0d55bba 100644
--- a/testsuite/tests/dependent/should_compile/dynamic-paper.hs
+++ b/testsuite/tests/dependent/should_compile/dynamic-paper.hs
@@ -2,7 +2,7 @@
 Stephanie Weirich, Richard Eisenberg, and Dimitrios Vytiniotis, 2016. -}
 
 -- NB: it includes a negative-recursive function (see delta1), and
--- so will give "simplifer ticks exhausted", at least with -O
+-- so will give "simplifier ticks exhausted", at least with -O
 
 {-#  LANGUAGE RankNTypes, PolyKinds, TypeOperators,
              ScopedTypeVariables, GADTs, FlexibleInstances,