X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDesugar.lhs;h=422dec02b17adc0267d57b0f376cee037bf8b559;hb=94ff1ec1546169fc839b2318c0d141f3089d3e26;hp=da0b92a46ebc31035232d2bee257be9a9affba69;hpb=e7d21ee4f8ac907665a7e170c71d59e13a01da09;p=ghc-hetmet.git

diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs
index da0b92a..422dec0 100644
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/ghc/compiler/deSugar/Desugar.lhs
@@ -1,96 +1,71 @@
 %
-% (c) The GRASP/AQUA Project, Glasgow University, 1992-1995
+% (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
 \section[Desugar]{@deSugar@: the main function}
 
 \begin{code}
-#include "HsVersions.h"
-
-module Desugar (
-	deSugar,
-
-	-- and to make the interface self-sufficient...
-	SplitUniqSupply, Binds, Expr, Id, TypecheckedPat,
-	CoreBinding, GlobalSwitch, SwitchResult,
-	Bag, DsMatchContext, DsMatchKind
-    ) where
-
+module Desugar ( deSugar ) where
 
-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
+#include "HsVersions.h"
 
-import Bag		( unionBags, Bag )
-import CmdLineOpts	( switchIsOn, GlobalSwitch(..), SwitchResult )
-import CoreLift		( liftCoreBindings )
-import CoreLint		( lintCoreBindings )
-import DsBinds		( dsBinds, dsInstBinds )
-import IdEnv
-import Pretty		( PprStyle(..) )
-import SplitUniq
-import Util
+import CmdLineOpts	( opt_D_dump_ds )
+import HsSyn		( MonoBinds )
+import TcHsSyn		( TypecheckedMonoBinds, TypecheckedForeignDecl )
+import CoreSyn
+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 Module		( Module, moduleString )
+import Bag		( isEmptyBag, unionBags )
+import CmdLineOpts	( opt_SccGroup, opt_SccProfilingOn )
+import CoreLint		( beginPass, endPass )
+import ErrUtils		( doIfSet, pprBagOfWarnings )
+import Outputable
+import UniqSupply	( splitUniqSupply, UniqSupply )
 \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
-	-> FAST_STRING			-- module name
-
-	-> (TypecheckedBinds,   -- input: class, instance, and value
-	    TypecheckedBinds,	--   bindings; see "tcModule" (which produces
-	    TypecheckedBinds,	--   them)
-	    [(Inst, TypecheckedExpr)])
--- ToDo: handling of const_inst thingies is certainly WRONG ***************************
-
-	-> ([PlainCoreBinding],	-- output
-	    Bag DsMatchContext)	-- Shadowing complaints
-
-deSugar us sw_chkr 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 sw_chkr 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)
-	core_clas_prs	= pairsFromCoreBinds core_clas_binds
-			
-	(core_inst_binds, shadows3)
-			= initDs us2 consts_env sw_chkr 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)
-	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)
-	       [CoRec (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
-
-	really_final_binds = if switchIsOn sw_chkr DoCoreLinting
-			     then lintCoreBindings PprDebug "Desugarer" False lift_final_binds
-			     else lift_final_binds
+deSugar :: UniqSupply		-- name supply
+        -> ValueEnv		-- 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_warns1) = 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 mod_name fo_decls)
+
+  	    ds_binds  = fi_binds ++ ds_binds' ++ fe_binds
+
+	    ds_warns = ds_warns1 `unionBags` ds_warns2
+
+	 -- Display any warnings
+        doIfSet (not (isEmptyBag ds_warns))
+		(printErrs (pprBagOfWarnings 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 -> _PK_ (moduleString mod_name)	-- default: module name
 
-	shadows = shadows1 `unionBags` shadows2 `unionBags` shadows3 `unionBags` shadows4
-    in
-    (really_final_binds, shadows)
 \end{code}