[commit: ghc] ghc-kinds: Comments only (c593902)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : ghc-kinds

http://hackage.haskell.org/trac/ghc/changeset/c5939022927b9ce28f66230968bed1b6a55322b9

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

commit c5939022927b9ce28f66230968bed1b6a55322b9
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 2 09:33:49 2011 +0000

    Comments only

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

 compiler/typecheck/TcUnify.lhs |    4 ++--
 compiler/types/Class.lhs       |    3 ++-
 compiler/types/TyCon.lhs       |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/compiler/typecheck/TcUnify.lhs b/compiler/typecheck/TcUnify.lhs
index d32d817..f8180ca 100755
--- a/compiler/typecheck/TcUnify.lhs
+++ b/compiler/typecheck/TcUnify.lhs
@@ -1118,8 +1118,8 @@ matchExpectedFunKind _                         = return Nothing
 
 -----------------  
 unifyKind :: SDoc             -- Error message
-          -> TcKind	      -- k1
-          -> TcKind  	      -- k2
+          -> TcKind	      -- k1 (actual)
+          -> TcKind  	      -- k2 (expected)
           -> TcM Ordering     -- Returns the relation between the kinds
 	     	 	      -- LT <=> k1 is a sub-kind of k2
 
diff --git a/compiler/types/Class.lhs b/compiler/types/Class.lhs
index 3b71ce3..dcbaad4 100644
--- a/compiler/types/Class.lhs
+++ b/compiler/types/Class.lhs
@@ -55,8 +55,9 @@ data Class
 	className :: Name,              -- Just the cached name of the TyCon
 	classKey  :: Unique,		-- Cached unique of TyCon
 	
-	classTyVars  :: [TyVar],	-- The class type variables;
+	classTyVars  :: [TyVar],	-- The class kind and type variables;
 		     			-- identical to those of the TyCon
+
 	classFunDeps :: [FunDep TyVar],	-- The functional dependencies
 
 	-- Superclasses: eg: (F a ~ b, F b ~ G a, Eq a, Show b)
diff --git a/compiler/types/TyCon.lhs b/compiler/types/TyCon.lhs
index 308d455..5e56eb7 100755
--- a/compiler/types/TyCon.lhs
+++ b/compiler/types/TyCon.lhs
@@ -336,7 +336,7 @@ data TyCon
 	tc_kind     :: Kind,
 	tyConArity  :: Arity,
 
-	tyConTyVars :: [TyVar],	  -- ^ The type variables used in the type constructor.
+	tyConTyVars :: [TyVar],	  -- ^ The kind and type variables used in the type constructor.
                                   -- Invariant: length tyvars = arity
 	                          -- Precisely, this list scopes over:
 	                          --