X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDesugar.lhs;h=14db54b456626bb1582bd41fe2a89bbea1cbbf7b;hb=9e2327f36f27da1a9caecdfa984c737b42e5360b;hp=4db1bdfc9d886ae6372c8b8aee2d2a5875db3629;hpb=6c381e873e222417d9a67aeec77b9555eca7b7a8;p=ghc-hetmet.git

diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs
index 4db1bdf..14db54b 100644
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/ghc/compiler/deSugar/Desugar.lhs
@@ -6,25 +6,39 @@
 \begin{code}
 #include "HsVersions.h"
 
-module Desugar ( deSugar, DsMatchContext, pprDsWarnings ) where
-
-import Ubiq{-uitous-}
-
-import HsSyn		( HsBinds, HsExpr )
-import TcHsSyn		( TypecheckedHsBinds(..), TypecheckedHsExpr(..) )
+module Desugar ( deSugar, pprDsWarnings
+#if __GLASGOW_HASKELL__ < 200
+		, DsMatchContext
+#endif
+	       ) where
+
+IMP_Ubiq(){-uitous-}
+
+import CmdLineOpts	( opt_D_dump_ds )
+import HsSyn		( HsBinds, HsExpr, MonoBinds,
+			  SYN_IE(RecFlag), nonRecursive, recursive
+			)
+import TcHsSyn		( SYN_IE(TypecheckedMonoBinds), SYN_IE(TypecheckedHsExpr)
+			)
 import CoreSyn
-
+import PprCore		( pprCoreBindings )
+import Name             ( isExported )
 import DsMonad
-import DsBinds		( dsBinds, dsInstBinds )
+import DsBinds		( dsMonoBinds )
 import DsUtils
 
-import Bag		( unionBags )
-import CmdLineOpts	( opt_DoCoreLinting )
+import Bag		( unionBags, isEmptyBag )
+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 )
-import PprStyle		( PprStyle(..) )
-import UniqSupply	( splitUniqSupply )
+import Id		( nullIdEnv, mkIdEnv, idType, 
+			  SYN_IE(DictVar), GenId, SYN_IE(Id) )
+import ErrUtils		( dumpIfSet, doIfSet )
+import Outputable	( PprStyle(..), pprDumpStyle, pprErrorsStyle, printErrs )
+import Pretty		( Doc )
+import UniqSupply	( splitUniqSupply, UniqSupply )
 \end{code}
 
 The only trick here is to get the @DsMonad@ stuff off to a good
@@ -32,56 +46,35 @@ 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
+	-> Module		-- module name
+	-> TypecheckedMonoBinds
+	-> IO [CoreBinding]	-- output
 
-deSugar us mod_name (clas_binds, inst_binds, val_binds, const_inst_pairs)
+deSugar us mod_name all_binds
   = let
-	(us0, us0a) = splitUniqSupply us
-	(us1, us1a) = splitUniqSupply us0a
-	(us2, us2a) = splitUniqSupply us1a
-	(us3, us4)  = splitUniqSupply us2a
+	(us1, us2) = splitUniqSupply us
 
-	((core_const_prs, consts_pairs), shadows1)
-	    = initDs us0 nullIdEnv mod_name (dsInstBinds [] const_inst_pairs)
+        module_and_group = (mod_name, grp_name)
+	grp_name  = case opt_SccGroup of
+		    	Just xx -> _PK_ xx
+		    	Nothing -> mod_name	-- default: module name
 
-	consts_env = mkIdEnv consts_pairs
+	(core_prs, ds_warns) = initDs us1 nullIdEnv module_and_group 
+			       (dsMonoBinds opt_SccProfilingOn recursive all_binds [])
 
-	(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
+	ds_binds = liftCoreBindings us2 [Rec core_prs]
+    in
 
-	    else -- gotta make it recursive (sigh)
-	       [Rec (core_clas_prs ++ core_inst_prs ++ core_const_prs ++ core_val_pairs)]
+	-- Display any warnings
+    doIfSet (not (isEmptyBag ds_warns))
+	(printErrs (pprDsWarnings pprErrorsStyle ds_warns)) >>
 
-	lift_final_binds = liftCoreBindings us4 final_binds
+	-- Lint result if necessary
+    lintCoreBindings "Desugarer" False ds_binds >>
 
-	really_final_binds = if opt_DoCoreLinting
-			     then lintCoreBindings PprDebug "Desugarer" False lift_final_binds
-			     else lift_final_binds
+	-- Dump output
+    dumpIfSet opt_D_dump_ds "Desugared:"
+	(pprCoreBindings pprDumpStyle ds_binds)	>>
 
-	shadows = shadows1 `unionBags` shadows2 `unionBags` shadows3 `unionBags` shadows4
-    in
-    (really_final_binds, shadows)
+    return ds_binds    
 \end{code}