X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDesugar.lhs;h=2cb65c9c53b84ef96ac13c54aa18d67329ffa6bb;hb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;hp=87d90b2a2bb8b43576dec4f4099a28c5b3f137c7;hpb=9dd6e1c216993624a2cd74b62ca0f0569c02c26b;p=ghc-hetmet.git

diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs
index 87d90b2..2cb65c9 100644
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/ghc/compiler/deSugar/Desugar.lhs
@@ -1,38 +1,29 @@
 %
-% (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}
-module Desugar ( deSugar, pprDsWarnings
-#if __GLASGOW_HASKELL__ < 200
-		, DsMatchContext
-#endif
-	       ) where
+module Desugar ( deSugar ) where
 
 #include "HsVersions.h"
 
 import CmdLineOpts	( opt_D_dump_ds )
-import HsSyn		( HsBinds, HsExpr, MonoBinds
-			)
-import TcHsSyn		( TypecheckedMonoBinds, TypecheckedHsExpr
-			)
+import HsSyn		( MonoBinds )
+import TcHsSyn		( TypecheckedMonoBinds, TypecheckedForeignDecl )
 import CoreSyn
-import PprCore		( pprCoreBindings )
-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, isEmptyBag )
-import BasicTypes       ( Module, RecFlag(..) )
-import CmdLineOpts	( opt_DoCoreLinting, opt_SccGroup, opt_SccProfilingOn )
-import CostCentre       ( IsCafCC(..), mkAutoCC )
-import CoreLift		( liftCoreBindings )
-import CoreLint		( lintCoreBindings )
-import Id		( nullIdEnv, mkIdEnv, idType, 
-			  DictVar, GenId, Id )
-import ErrUtils		( dumpIfSet, doIfSet )
+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}
@@ -42,35 +33,38 @@ start.
 
 \begin{code}
 deSugar :: UniqSupply		-- name supply
+        -> GlobalValueEnv	-- value env
 	-> Module		-- module name
 	-> TypecheckedMonoBinds
-	-> IO [CoreBinding]	-- output
+	-> [TypecheckedForeignDecl]
+	-> IO ([CoreBind], SDoc, SDoc) -- output
 
-deSugar us mod_name all_binds
-  = let
-	(us1, us2) = splitUniqSupply us
+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]
 
-        module_and_group = (mod_name, grp_name)
-	grp_name  = case opt_SccGroup of
-		    	Just xx -> _PK_ xx
-		    	Nothing -> mod_name	-- default: module name
+    	    ((fi_binds, fe_binds, h_code, c_code), ds_warns2) = 
+	            initDs us3 global_val_env module_and_group (dsForeigns fo_decls)
 
-	(core_prs, ds_warns) = initDs us1 nullIdEnv module_and_group 
-			       (dsMonoBinds opt_SccProfilingOn all_binds [])
+  	    ds_binds  = fi_binds ++ ds_binds' ++ fe_binds
 
-	ds_binds = liftCoreBindings us2 [Rec core_prs]
-    in
+	 -- Display any warnings
+        doIfSet (not (isEmptyBag ds_warns))
+		(printErrs (pprDsWarnings ds_warns))
 
-	-- 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
 
-	-- Lint result if necessary
-    lintCoreBindings "Desugarer" False ds_binds >>
+    module_and_group = (mod_name, grp_name)
+    grp_name  = case opt_SccGroup of
+	          Just xx -> _PK_ xx
+	    	  Nothing -> mod_name	-- default: module name
 
-	-- Dump output
-    dumpIfSet opt_D_dump_ds "Desugared:"
-	(pprCoreBindings ds_binds)	>>
-
-    return ds_binds    
 \end{code}