[project @ 1999-01-23 17:34:37 by sof]

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

diff --git a/ghc/compiler/typecheck/TcModule.lhs b/ghc/compiler/typecheck/TcModule.lhs
index 10a07f3..0358f11 100644 (file)
--- a/ghc/compiler/typecheck/TcModule.lhs
+++ b/ghc/compiler/typecheck/TcModule.lhs
@@ -44,7 +44,7 @@ import TcType         ( TcType, typeToTcType,
 
 import RnMonad         ( RnNameSupply )
 import Bag             ( isEmptyBag )
-import ErrUtils                ( ErrMsg, 
+import ErrUtils                ( Message,
                          pprBagOfErrors, dumpIfSet
                        )
 import Id              ( Id, idType )
@@ -254,7 +254,7 @@ tcModule rn_name_supply
        in
        zonkTopBinds all_binds          `thenNF_Tc` \ (all_binds', really_final_env)  ->
        tcSetValueEnv really_final_env  $
-       zonkForeignExports foe_decls    `thenNF_Tc` \ foe_decls' ->
+       zonkForeignExports foe_decls    `thenNF_Tc` \ foe_decls' ->
 
        let
           thin_air_ids = map (explicitLookupValueByKey really_final_env . nameUnique) thinAirIdNames
@@ -264,7 +264,7 @@ tcModule rn_name_supply
        in
        returnTc (really_final_env, 
                  (all_binds', local_tycons, local_classes, inst_info,
-                  foi_decls ++ foe_decls',
+                  (foi_decls ++ foe_decls'),
                   really_final_env,
                   thin_air_ids))
        )
@@ -312,7 +312,7 @@ noMainErr
   = hsep [ptext SLIT("Module"), quotes (pprModule mAIN), 
          ptext SLIT("must include a definition for"), quotes (ppr main_NAME)]
 
-mainTyMisMatch :: TcType -> TcType -> ErrMsg
+mainTyMisMatch :: TcType -> TcType -> Message
 mainTyMisMatch expected actual
   = hang (hsep [ppr main_NAME, ptext SLIT("has the wrong type")])
         4 (vcat [