[project @ 2001-03-13 12:50:29 by simonmar]

[ghc-hetmet.git] / ghc / compiler / deSugar / Desugar.lhs

diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs
index 4b2143b..aa0fde2 100644 (file)
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/ghc/compiler/deSugar/Desugar.lhs
@@ -9,6 +9,7 @@ module Desugar ( deSugar, deSugarExpr ) where
 #include "HsVersions.h"
 
 import CmdLineOpts     ( DynFlags, DynFlag(..), dopt, opt_SccProfilingOn )
+import HscTypes                ( ModDetails(..) )
 import HsSyn           ( MonoBinds, RuleDecl(..), RuleBndr(..), 
                          HsExpr(..), HsBinds(..), MonoBinds(..) )
 import TcHsSyn         ( TypecheckedRuleDecl, TypecheckedHsExpr )
@@ -25,12 +26,12 @@ import DsExpr               ()      -- Forces DsExpr to be compiled; DsBinds only
                                -- depends on DsExpr.hi-boot.
 import Module          ( Module )
 import Id              ( Id )
-import Name            ( lookupNameEnv )
+import NameEnv         ( lookupNameEnv )
 import VarEnv
 import VarSet
 import Bag             ( isEmptyBag )
 import CoreLint                ( showPass, endPass )
-import ErrUtils                ( doIfSet, pprBagOfWarnings )
+import ErrUtils                ( doIfSet, dumpIfSet_dyn, pprBagOfWarnings )
 import Outputable
 import UniqSupply      ( mkSplitUniqSupply )
 import HscTypes                ( HomeSymbolTable, PersistentCompilerState(..), TyThing(..), lookupType,  )
@@ -50,20 +51,27 @@ deSugar :: DynFlags
        -> PersistentCompilerState -> HomeSymbolTable
        -> Module -> PrintUnqualified
         -> TcResults
-       -> IO ([CoreBind], [(Id,CoreRule)], SDoc, SDoc, [CoreBndr])
+       -> IO (ModDetails, (SDoc, SDoc, [CoreBndr]))
 
 deSugar dflags pcs hst mod_name unqual
-        (TcResults {tc_env   = local_type_env,
+        (TcResults {tc_env   = type_env,
                    tc_binds = all_binds,
+                   tc_insts = insts,
                    tc_rules = rules,
                    tc_fords = fo_decls})
   = do { showPass dflags "Desugar"
        ; us <- mkSplitUniqSupply 'd'
 
        -- Do desugaring
-       ; let (result, ds_warns) = initDs dflags us lookup mod_name
-                                         (dsProgram mod_name all_binds rules fo_decls)    
-             (ds_binds, ds_rules, _, _, _) = result
+       ; let (ds_result, ds_warns) = initDs dflags us lookup mod_name
+                                            (dsProgram mod_name all_binds rules fo_decls)    
+
+             (ds_binds, ds_rules, foreign_stuff) = ds_result
+       
+             mod_details = ModDetails { md_types = type_env,
+                                        md_insts = insts,
+                                        md_rules = ds_rules,
+                                        md_binds = ds_binds }
 
        -- Display any warnings
         ; doIfSet (not (isEmptyBag ds_warns))
@@ -76,7 +84,7 @@ deSugar dflags pcs hst mod_name unqual
        ; doIfSet (dopt Opt_D_dump_ds dflags) 
                (printDump (ppr_ds_rules ds_rules))
 
-        ; return result
+        ; return (mod_details, foreign_stuff)
        }
 
   where
@@ -88,7 +96,7 @@ deSugar dflags pcs hst mod_name unqual
     lookup n = case lookupType hst pte n of {
                 Just (AnId v) -> v ;
                 other -> 
-              case lookupNameEnv local_type_env n of
+              case lookupNameEnv type_env n of
                 Just (AnId v) -> v ;
                 other         -> pprPanic "Desugar: lookup:" (ppr n)
                }
@@ -110,8 +118,7 @@ deSugarExpr dflags pcs hst mod_name unqual tc_expr
                  (printErrs unqual (pprBagOfWarnings ds_warns))
 
        -- Dump output
-        ; let do_dump_ds = dopt Opt_D_dump_ds dflags
-       ; doIfSet do_dump_ds (printDump (pprCoreExpr core_expr))
+       ; dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared" (pprCoreExpr core_expr)
 
         ; return core_expr
        }
@@ -135,7 +142,7 @@ dsProgram mod_name all_binds rules fo_decls
        local_binders = mkVarSet (bindersOfBinds ds_binds)
     in
     mapDs (dsRule local_binders) rules `thenDs` \ rules' ->
-    returnDs (ds_binds, rules', h_code, c_code, fe_binders)
+    returnDs (ds_binds, rules', (h_code, c_code, fe_binders))
   where
     auto_scc | opt_SccProfilingOn = TopLevel
             | otherwise          = NoSccs