[project @ 1996-03-19 08:58:34 by partain]

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

diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs
index da0b92a..4db1bdf 100644 (file)
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/ghc/compiler/deSugar/Desugar.lhs
@@ -1,56 +1,49 @@
 %
-% (c) The GRASP/AQUA Project, Glasgow University, 1992-1995
+% (c) The GRASP/AQUA Project, Glasgow University, 1992-1996
 %
 \section[Desugar]{@deSugar@: the main function}
 
 \begin{code}
 #include "HsVersions.h"
 
-module Desugar (
-       deSugar,
+module Desugar ( deSugar, DsMatchContext, pprDsWarnings ) where
 
-       -- and to make the interface self-sufficient...
-       SplitUniqSupply, Binds, Expr, Id, TypecheckedPat,
-       CoreBinding, GlobalSwitch, SwitchResult,
-       Bag, DsMatchContext, DsMatchKind
-    ) where
+import Ubiq{-uitous-}
 
+import HsSyn           ( HsBinds, HsExpr )
+import TcHsSyn         ( TypecheckedHsBinds(..), TypecheckedHsExpr(..) )
+import CoreSyn
 
-import AbsSyn          -- the stuff being desugared
-import PlainCore       -- the output of desugaring;
-                       -- importing this module also gets all the
-                       -- CoreSyn utility functions
-import DsMonad         -- the monadery used in the desugarer
+import DsMonad
+import DsBinds         ( dsBinds, dsInstBinds )
+import DsUtils
 
-import Bag             ( unionBags, Bag )
-import CmdLineOpts     ( switchIsOn, GlobalSwitch(..), SwitchResult )
+import Bag             ( unionBags )
+import CmdLineOpts     ( opt_DoCoreLinting )
 import CoreLift                ( liftCoreBindings )
 import CoreLint                ( lintCoreBindings )
-import DsBinds         ( dsBinds, dsInstBinds )
-import IdEnv
-import Pretty          ( PprStyle(..) )
-import SplitUniq
-import Util
+import Id              ( nullIdEnv, mkIdEnv )
+import PprStyle                ( PprStyle(..) )
+import UniqSupply      ( splitUniqSupply )
 \end{code}
 
-The only trick here is to get the @DesugarMonad@ stuff off to a good
+The only trick here is to get the @DsMonad@ stuff off to a good
 start.
 
 \begin{code}
-deSugar :: SplitUniqSupply             -- name supply
-       -> (GlobalSwitch->SwitchResult) -- switch looker upper
+deSugar :: UniqSupply          -- name supply
        -> FAST_STRING                  -- module name
 
-       -> (TypecheckedBinds,   -- input: class, instance, and value
-           TypecheckedBinds,   --   bindings; see "tcModule" (which produces
-           TypecheckedBinds,   --   them)
-           [(Inst, TypecheckedExpr)])
+       -> (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 ***************************
 
-       -> ([PlainCoreBinding], -- output
+       -> ([CoreBinding],      -- output
            Bag DsMatchContext) -- Shadowing complaints
 
-deSugar us sw_chkr mod_name (clas_binds, inst_binds, val_binds, const_inst_pairs)
+deSugar us mod_name (clas_binds, inst_binds, val_binds, const_inst_pairs)
   = let
        (us0, us0a) = splitUniqSupply us
        (us1, us1a) = splitUniqSupply us0a
@@ -58,20 +51,20 @@ deSugar us sw_chkr mod_name (clas_binds, inst_binds, val_binds, const_inst_pairs
        (us3, us4)  = splitUniqSupply us2a
 
        ((core_const_prs, consts_pairs), shadows1)
-           = initDs us0 nullIdEnv sw_chkr mod_name (dsInstBinds [] const_inst_pairs)
+           = initDs us0 nullIdEnv mod_name (dsInstBinds [] const_inst_pairs)
 
        consts_env = mkIdEnv consts_pairs
 
        (core_clas_binds, shadows2)
-                       = initDs us1 consts_env sw_chkr mod_name (dsBinds clas_binds)
+                       = initDs us1 consts_env mod_name (dsBinds clas_binds)
        core_clas_prs   = pairsFromCoreBinds core_clas_binds
-                       
+
        (core_inst_binds, shadows3)
-                       = initDs us2 consts_env sw_chkr mod_name (dsBinds inst_binds)
+                       = initDs us2 consts_env mod_name (dsBinds inst_binds)
        core_inst_prs   = pairsFromCoreBinds core_inst_binds
-                       
+
        (core_val_binds, shadows4)
-                       = initDs us3 consts_env sw_chkr mod_name (dsBinds val_binds)
+                       = initDs us3 consts_env mod_name (dsBinds val_binds)
        core_val_pairs  = pairsFromCoreBinds core_val_binds
 
        final_binds
@@ -80,13 +73,11 @@ deSugar us sw_chkr mod_name (clas_binds, inst_binds, val_binds, const_inst_pairs
                core_clas_binds ++ core_val_binds
 
            else -- gotta make it recursive (sigh)
-              [CoRec (core_clas_prs ++ core_inst_prs ++ core_const_prs ++ core_val_pairs)]
+              [Rec (core_clas_prs ++ core_inst_prs ++ core_const_prs ++ core_val_pairs)]
 
-       lift_final_binds = {-if switchIsOn sw_chkr GlasgowExts
-                          then-} liftCoreBindings us4 final_binds
-                          -- else final_binds
+       lift_final_binds = liftCoreBindings us4 final_binds
 
-       really_final_binds = if switchIsOn sw_chkr DoCoreLinting
+       really_final_binds = if opt_DoCoreLinting
                             then lintCoreBindings PprDebug "Desugarer" False lift_final_binds
                             else lift_final_binds