[commit: ghc] master: Comments only (6adff01)

[git at git.haskell.org]

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

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

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

commit 6adff0107421e973d276f1524232e5ef0718d3f2
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Jun 1 14:48:36 2016 +0100

    Comments only


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

6adff0107421e973d276f1524232e5ef0718d3f2
 compiler/rename/RnSource.hs | 8 +++++++-
 compiler/types/TyCoRep.hs   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs
index 4a71f2d..d43945f 100644
--- a/compiler/rename/RnSource.hs
+++ b/compiler/rename/RnSource.hs
@@ -1529,7 +1529,7 @@ modules), we get better error messages, too.
 ----------------------------------------------------------
 -- | 'InstDeclFreeVarsMap is an association of an
 --   @InstDecl@ with @FreeVars at . The @FreeVars@ are
---   the names that are
+--   the tycon names that are both
 --     a) free in the instance declaration
 --     b) bound by this group of type/class/instance decls
 type InstDeclFreeVarsMap = [(LInstDecl Name, FreeVars)]
@@ -1546,6 +1546,12 @@ mkInstDeclFreeVarsMap rdr_env tycl_bndrs inst_ds_fvs
 
 -- | Get the @LInstDecl at s which have empty @FreeVars@ sets, and the
 --   @InstDeclFreeVarsMap@ with these entries removed.
+-- We call (getInsts tcs instd_map) when we've completed the declarations
+-- for 'tcs'.  The call returns (inst_decls, instd_map'), where
+--   inst_decls are the instance declarations all of
+--              whose free vars are now defined
+--   instd_map' is the inst-decl map with 'tcs' removed from
+--               the free-var set
 getInsts :: [Name] -> InstDeclFreeVarsMap -> ([LInstDecl Name], InstDeclFreeVarsMap)
 getInsts bndrs inst_decl_map
   = partitionWith pick_me inst_decl_map
diff --git a/compiler/types/TyCoRep.hs b/compiler/types/TyCoRep.hs
index 053101c..70d8bba 100644
--- a/compiler/types/TyCoRep.hs
+++ b/compiler/types/TyCoRep.hs
@@ -493,7 +493,7 @@ In type declarations:
 * Specified (k)
      data T2 (a::k->*) b = MkT (a b)
   Here T's kind is  T :: forall (k:*). (k->*) -> k -> *
-  The kind vairable 'k' is Specified, since it is mentioned in
+  The kind variable 'k' is Specified, since it is mentioned in
   the signature.
 
 * Visible (k)