[project @ 1998-12-02 13:17:09 by simonm]

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

diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs
index 281d988..2cb65c9 100644 (file)
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/ghc/compiler/deSugar/Desugar.lhs
@@ -1,41 +1,30 @@
 %
-% (c) The GRASP/AQUA Project, Glasgow University, 1992-1996
+% (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
 \section[Desugar]{@deSugar@: the main function}
 
 \begin{code}
-#include "HsVersions.h"
-
-module Desugar ( deSugar, pprDsWarnings
-#if __GLASGOW_HASKELL__ < 200
-               , DsMatchContext
-               , DsWarnFlavour -- fluff needed for closure, 
-                                -- removed when compiling with 1.4
-#endif
-              ) where
+module Desugar ( deSugar ) where
 
-IMP_Ubiq(){-uitous-}
+#include "HsVersions.h"
 
-import HsSyn           ( HsBinds, HsExpr, MonoBinds,
-                         SYN_IE(RecFlag), nonRecursive, recursive
-                       )
-import TcHsSyn         ( SYN_IE(TypecheckedMonoBinds), SYN_IE(TypecheckedHsExpr)
-                       )
+import CmdLineOpts     ( opt_D_dump_ds )
+import HsSyn           ( MonoBinds )
+import TcHsSyn         ( TypecheckedMonoBinds, TypecheckedForeignDecl )
 import CoreSyn
-import Name             ( isExported )
 import DsMonad
 import DsBinds         ( dsMonoBinds )
+import DsForeign       ( dsForeigns )
 import DsUtils
+import DsExpr          ()      -- Forces DsExpr to be compiled; DsBinds only
+                               -- depends on DsExpr.hi-boot.
 
-import Bag             ( unionBags )
-import BasicTypes       ( SYN_IE(Module) )
-import CmdLineOpts     ( opt_DoCoreLinting, opt_SccGroup, opt_SccProfilingOn )
-import CostCentre       ( IsCafCC(..), mkAutoCC )
-import CoreLift                ( liftCoreBindings )
-import CoreLint                ( lintCoreBindings )
-import Id              ( nullIdEnv, mkIdEnv, idType, 
-                         SYN_IE(DictVar), GenId, SYN_IE(Id) )
-import Outputable      ( PprStyle(..) )
+import Bag             ( isEmptyBag )
+import BasicTypes       ( Module )
+import CmdLineOpts     ( opt_SccGroup, opt_SccProfilingOn )
+import CoreLint                ( beginPass, endPass )
+import ErrUtils                ( doIfSet )
+import Outputable
 import UniqSupply      ( splitUniqSupply, UniqSupply )
 \end{code}
 
@@ -44,28 +33,38 @@ start.
 
 \begin{code}
 deSugar :: UniqSupply          -- name supply
+        -> GlobalValueEnv      -- value env
        -> Module               -- module name
        -> TypecheckedMonoBinds
-       -> ([CoreBinding],      -- output
-           DsWarnings)     -- Shadowing complaints
+       -> [TypecheckedForeignDecl]
+       -> IO ([CoreBind], SDoc, SDoc) -- output
+
+deSugar us global_val_env mod_name all_binds fo_decls = do
+       beginPass "Desugar"
+       -- Do desugaring
+       let (core_prs, ds_warns) = initDs us1 global_val_env module_and_group 
+                                           (dsMonoBinds opt_SccProfilingOn all_binds [])
+            ds_binds' = [Rec core_prs]
+
+           ((fi_binds, fe_binds, h_code, c_code), ds_warns2) = 
+                   initDs us3 global_val_env module_and_group (dsForeigns fo_decls)
 
-deSugar us mod_name all_binds
-  = let
-       (us1, us2) = splitUniqSupply us
+           ds_binds  = fi_binds ++ ds_binds' ++ fe_binds
 
-        module_and_group = (mod_name, grp_name)
-       grp_name  = case opt_SccGroup of
-                       Just xx -> _PK_ xx
-                       Nothing -> mod_name     -- default: module name
+        -- Display any warnings
+        doIfSet (not (isEmptyBag ds_warns))
+               (printErrs (pprDsWarnings ds_warns))
 
-       (core_prs, shadows) = initDs us1 nullIdEnv module_and_group 
-                             (dsMonoBinds opt_SccProfilingOn recursive all_binds [])
+        -- Lint result if necessary
+        endPass "Desugar" opt_D_dump_ds ds_binds
+        return (ds_binds, h_code, c_code)
+  where
+    (us1, us2) = splitUniqSupply us
+    (us3, us4) = splitUniqSupply us2
 
-       lift_final_binds = liftCoreBindings us2 [Rec core_prs]
+    module_and_group = (mod_name, grp_name)
+    grp_name  = case opt_SccGroup of
+                 Just xx -> _PK_ xx
+                 Nothing -> mod_name   -- default: module name
 
-       really_final_binds = if opt_DoCoreLinting
-                            then lintCoreBindings PprDebug "Desugarer" False lift_final_binds
-                            else lift_final_binds
-    in
-    (really_final_binds, shadows)
 \end{code}