[project @ 2000-10-16 13:29:13 by sewardj]

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

diff --git a/ghc/compiler/typecheck/TcModule.lhs b/ghc/compiler/typecheck/TcModule.lhs
index 62da34d..9bb9fbf 100644 (file)
--- a/ghc/compiler/typecheck/TcModule.lhs
+++ b/ghc/compiler/typecheck/TcModule.lhs
@@ -87,9 +87,9 @@ typecheckModule
 typecheckModule pcs hst (HsModule mod_name _ _ _ decls _ src_loc)
   = do { env <- initTcEnv global_symbol_table global_inst_env ;
 
-        (_, (maybe_result, warns, errs)) <- initTc env src_loc tc_module
+        (_, (maybe_result, msgs)) <- initTc env src_loc tc_module
                
-        printErrorsAndWarnings errs warns ;
+        printErrorsAndWarnings msgs ;
        
         printTcDumps maybe_result ;
                        
@@ -100,7 +100,7 @@ typecheckModule pcs hst (HsModule mod_name _ _ _ decls _ src_loc)
     }
   where
     this_mod           = mkThisModule
-    global_symbol_table = pcsPST pcs `plusModuleEnv` hst
+    global_symbol_table = pcs_PST pcs `plusModuleEnv` hst
 
     tc_module = fixTc (\ ~(unf_env ,_) -> tcModule pcs hst this_mod decls unf_env)
 \end{code}
@@ -237,10 +237,10 @@ tcModule pcs hst this_mod decls unf_env
        local_type_env = lookupWithDefaultFM groups this_mod emptyNameEnv
     
        new_pst :: PackageSymbolTable
-       new_pst = extendTypeEnv (pcsPST pcs) (delFromFM groups this_mod)
+       new_pst = extendTypeEnv (pcs_PST pcs) (delFromFM groups this_mod)
 
        final_pcs :: PersistentCompilerState
-       final_pcs = pcs_with_insts {pcsPST = new_pst}
+       final_pcs = pcs_with_insts {pcs_PST = new_pst}
     in  
     returnTc (really_final_env, 
              TcResults { tc_pcs     = final_pcs,