[project @ 1996-04-08 16:15:43 by partain]

[ghc-hetmet.git] / ghc / compiler / typecheck / Typecheck.lhs

diff --git a/ghc/compiler/typecheck/Typecheck.lhs b/ghc/compiler/typecheck/Typecheck.lhs
index f86c7de..5c260a2 100644 (file)
--- a/ghc/compiler/typecheck/Typecheck.lhs
+++ b/ghc/compiler/typecheck/Typecheck.lhs
@@ -19,7 +19,7 @@ import HsSyn
 import RnHsSyn
 import TcHsSyn
 
-import ErrUtils                ( TcWarning(..), TcError(..) )
+import ErrUtils                ( Warning(..), Error(..) )
 import Pretty
 import RnUtils         ( GlobalNameMappers(..), GlobalNameMapper(..) )
 import Maybes          ( MaybeErr(..) )
@@ -41,7 +41,8 @@ typecheckModule
     -> -- OUTPUTS ...
     MaybeErr
        -- SUCCESS ...
-      (((TypecheckedHsBinds,      -- binds from class decls; does NOT
+      (((TypecheckedHsBinds,      -- record selector definitions
+        TypecheckedHsBinds,       -- binds from class decls; does NOT
                                   --    include default-methods bindings
         TypecheckedHsBinds,       -- binds from instance decls; INCLUDES
                                   --    class default-methods binds
@@ -50,10 +51,10 @@ typecheckModule
         [(Id, TypecheckedHsExpr)] -- constant instance binds
        ),
 
-        ([RenamedFixityDecl], [Id], UniqFM TyCon, UniqFM Class, Bag InstInfo),
+        ([RenamedFixityDecl], [Id], [TyCon], [Class], Bag InstInfo),
                                -- things for the interface generator
 
-        (UniqFM TyCon, UniqFM Class),
+        ([TyCon], [Class]),
                                -- environments of info from this module only
 
        FiniteMap TyCon [(Bool, [Maybe Type])],
@@ -61,11 +62,11 @@ typecheckModule
 
        PprStyle->Pretty),      -- stuff to print for -ddump-deriving
 
-       Bag TcWarning)          -- pretty-print this to get warnings
+       Bag Warning)            -- pretty-print this to get warnings
 
        -- FAILURE ...
-      (Bag TcError,            -- pretty-print this to get errors
-       Bag TcWarning)          -- pretty-print this to get warnings
+      (Bag Error,              -- pretty-print this to get errors
+       Bag Warning)            -- pretty-print this to get warnings
 
 typecheckModule us renamer_name_funs mod
   = initTc us (tcModule renamer_name_funs mod)