[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 4db1bdf..2cb65c9 100644 (file)
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/ghc/compiler/deSugar/Desugar.lhs
@@ -1,30 +1,31 @@
 %
-% (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, DsMatchContext, pprDsWarnings ) where
+module Desugar ( deSugar ) where
 
-import Ubiq{-uitous-}
+#include "HsVersions.h"
 
-import HsSyn           ( HsBinds, HsExpr )
-import TcHsSyn         ( TypecheckedHsBinds(..), TypecheckedHsExpr(..) )
+import CmdLineOpts     ( opt_D_dump_ds )
+import HsSyn           ( MonoBinds )
+import TcHsSyn         ( TypecheckedMonoBinds, TypecheckedForeignDecl )
 import CoreSyn
-
 import DsMonad
-import DsBinds         ( dsBinds, dsInstBinds )
+import DsBinds         ( dsMonoBinds )
+import DsForeign       ( dsForeigns )
 import DsUtils
-
-import Bag             ( unionBags )
-import CmdLineOpts     ( opt_DoCoreLinting )
-import CoreLift                ( liftCoreBindings )
-import CoreLint                ( lintCoreBindings )
-import Id              ( nullIdEnv, mkIdEnv )
-import PprStyle                ( PprStyle(..) )
-import UniqSupply      ( splitUniqSupply )
+import DsExpr          ()      -- Forces DsExpr to be compiled; DsBinds only
+                               -- depends on DsExpr.hi-boot.
+
+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}
 
 The only trick here is to get the @DsMonad@ stuff off to a good
@@ -32,56 +33,38 @@ start.
 
 \begin{code}
 deSugar :: UniqSupply          -- name supply
-       -> FAST_STRING                  -- module name
-
-       -> (TypecheckedHsBinds,   -- input: class, instance, and value
-           TypecheckedHsBinds, --   bindings; see "tcModule" (which produces
-           TypecheckedHsBinds, --   them)
-           [(Id, TypecheckedHsExpr)])
--- ToDo: handling of const_inst thingies is certainly WRONG ***************************
-
-       -> ([CoreBinding],      -- output
-           Bag DsMatchContext) -- Shadowing complaints
-
-deSugar us mod_name (clas_binds, inst_binds, val_binds, const_inst_pairs)
-  = let
-       (us0, us0a) = splitUniqSupply us
-       (us1, us1a) = splitUniqSupply us0a
-       (us2, us2a) = splitUniqSupply us1a
-       (us3, us4)  = splitUniqSupply us2a
-
-       ((core_const_prs, consts_pairs), shadows1)
-           = initDs us0 nullIdEnv mod_name (dsInstBinds [] const_inst_pairs)
-
-       consts_env = mkIdEnv consts_pairs
-
-       (core_clas_binds, shadows2)
-                       = initDs us1 consts_env mod_name (dsBinds clas_binds)
-       core_clas_prs   = pairsFromCoreBinds core_clas_binds
-
-       (core_inst_binds, shadows3)
-                       = initDs us2 consts_env mod_name (dsBinds inst_binds)
-       core_inst_prs   = pairsFromCoreBinds core_inst_binds
-
-       (core_val_binds, shadows4)
-                       = initDs us3 consts_env mod_name (dsBinds val_binds)
-       core_val_pairs  = pairsFromCoreBinds core_val_binds
-
-       final_binds
-         = if (null core_clas_prs && null core_inst_prs && null core_const_prs) then
-               -- we don't have to make the whole thing recursive
-               core_clas_binds ++ core_val_binds
-
-           else -- gotta make it recursive (sigh)
-              [Rec (core_clas_prs ++ core_inst_prs ++ core_const_prs ++ core_val_pairs)]
-
-       lift_final_binds = liftCoreBindings us4 final_binds
-
-       really_final_binds = if opt_DoCoreLinting
-                            then lintCoreBindings PprDebug "Desugarer" False lift_final_binds
-                            else lift_final_binds
+        -> GlobalValueEnv      -- value env
+       -> Module               -- module name
+       -> TypecheckedMonoBinds
+       -> [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)
+
+           ds_binds  = fi_binds ++ ds_binds' ++ fe_binds
+
+        -- Display any warnings
+        doIfSet (not (isEmptyBag ds_warns))
+               (printErrs (pprDsWarnings ds_warns))
+
+        -- 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
+
+    module_and_group = (mod_name, grp_name)
+    grp_name  = case opt_SccGroup of
+                 Just xx -> _PK_ xx
+                 Nothing -> mod_name   -- default: module name
 
-       shadows = shadows1 `unionBags` shadows2 `unionBags` shadows3 `unionBags` shadows4
-    in
-    (really_final_binds, shadows)
 \end{code}