[project @ 2000-02-15 22:18:16 by panne]

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

diff --git a/ghc/compiler/typecheck/TcModule.lhs b/ghc/compiler/typecheck/TcModule.lhs
index cd82d9e..28a6bd4 100644 (file)
--- a/ghc/compiler/typecheck/TcModule.lhs
+++ b/ghc/compiler/typecheck/TcModule.lhs
@@ -46,9 +46,7 @@ import TcType         ( TcType, typeToTcType,
 
 import RnMonad         ( RnNameSupply, getIfaceFixities, Fixities, InterfaceDetails )
 import Bag             ( isEmptyBag )
-import ErrUtils                ( Message,
-                         pprBagOfErrors, dumpIfSet
-                       )
+import ErrUtils                ( Message, printErrorsAndWarnings, dumpIfSet )
 import Id              ( Id, idType )
 import Module           ( pprModuleName )
 import Name            ( Name, nameUnique, isLocallyDefined, NamedThing(..) )
@@ -99,8 +97,7 @@ typecheckModule us rn_name_supply iface_det mod
   = initTc us initEnv (tcModule rn_name_supply (getIfaceFixities iface_det) mod)
                        >>= \ (maybe_result, warns, errs) ->
                
-    print_errs warns   >>
-    print_errs errs    >>
+    printErrorsAndWarnings errs warns          >>
 
     -- write the thin-air Id map
     (case maybe_result of
@@ -124,10 +121,6 @@ pp_rules [] = empty
 pp_rules rs = vcat [ptext SLIT("{-# RULES"),
                    nest 4 (vcat (map ppr rs)),
                    ptext SLIT("#-}")]
-
-print_errs errs
-  | isEmptyBag errs = return ()
-  | otherwise       = printErrs (pprBagOfErrors errs)
 \end{code}
 
 The internal monster:
@@ -138,7 +131,7 @@ tcModule :: RnNameSupply    -- for renaming derivings
         -> TcM s TcResults     -- output
 
 tcModule rn_name_supply fixities
-       (HsModule mod_name verion exports imports decls src_loc)
+       (HsModule mod_name verion exports imports decls _ src_loc)
   = tcAddSrcLoc src_loc $      -- record where we're starting
 
     fixTc (\ ~(unf_env ,_) ->