X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDesugar.lhs;h=6e02ef831f7ceaf7c7cf8ade702e4f984fdb1e28;hb=57d07fb8c739fb50f957c25e8987632d04da3969;hp=9b4bfc0e6e2e646ed7fa31e2dc6c13e989ef3dfc;hpb=dcef38bab91d45b56f7cf3ceeec96303d93728bb;p=ghc-hetmet.git

diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs
index 9b4bfc0..6e02ef8 100644
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/ghc/compiler/deSugar/Desugar.lhs
@@ -4,39 +4,29 @@
 \section[Desugar]{@deSugar@: the main function}
 
 \begin{code}
+module Desugar ( deSugar, pprDsWarnings ) where
+
 #include "HsVersions.h"
 
-module Desugar ( deSugar, pprDsWarnings
-#if __GLASGOW_HASKELL__ < 200
-		, DsMatchContext
-	        , DsWarnFlavour -- fluff needed for closure, 
-				 -- removed when compiling with 1.4
-#endif
-	       ) where
-
-IMP_Ubiq(){-uitous-}
-
-import HsSyn		( HsBinds, HsExpr, MonoBinds,
-			  SYN_IE(RecFlag), nonRecursive
-			)
-import TcHsSyn		( SYN_IE(TypecheckedHsBinds), SYN_IE(TypecheckedHsExpr)
-			)
+import CmdLineOpts	( opt_D_dump_ds )
+import HsSyn		( MonoBinds )
+import TcHsSyn		( TypecheckedMonoBinds, TypecheckedForeignDecl )
+
 import CoreSyn
-import Name             ( isExported )
+import PprCore		( pprCoreBindings )
 import DsMonad
-import DsBinds		( dsBinds, dsMonoBinds )
+import DsBinds		( dsMonoBinds )
+import DsForeign	( dsForeigns )
 import DsUtils
 
-import Bag		( unionBags )
-import CmdLineOpts	( opt_DoCoreLinting, opt_AutoSccsOnAllToplevs, 
-		          opt_AutoSccsOnExportedToplevs, opt_SccGroup
-			   )
-import CostCentre       ( IsCafCC(..), mkAutoCC )
+import Bag		( isEmptyBag )
+import BasicTypes       ( Module )
+import CmdLineOpts	( opt_SccGroup, opt_SccProfilingOn )
 import CoreLift		( liftCoreBindings )
 import CoreLint		( lintCoreBindings )
-import Id		( nullIdEnv, mkIdEnv, idType, 
-			  SYN_IE(DictVar), GenId, SYN_IE(Id) )
-import PprStyle		( PprStyle(..) )
+import Id		( nullIdEnv, GenId, Id )
+import ErrUtils		( dumpIfSet, doIfSet )
+import Outputable
 import UniqSupply	( splitUniqSupply, UniqSupply )
 \end{code}
 
@@ -45,96 +35,42 @@ start.
 
 \begin{code}
 deSugar :: UniqSupply		-- name supply
-	-> FAST_STRING			-- module name
-
-	-> (TypecheckedHsBinds, -- input: recsel, class, instance, and value
-	    TypecheckedHsBinds, --   bindings; see "tcModule" (which produces
-	    TypecheckedHsBinds,	--   them)
-	    TypecheckedHsBinds,
-	    TypecheckedHsBinds)
--- ToDo: handling of const_inst thingies is certainly WRONG ***************************
-
-	-> ([CoreBinding],	-- output
-	    DsWarnings)	    -- Shadowing complaints
+	-> Module		-- module name
+	-> TypecheckedMonoBinds
+	-> [TypecheckedForeignDecl]
+	-> IO ([CoreBinding], SDoc, SDoc, SDoc) -- output
 
-deSugar us mod_name (recsel_binds, clas_binds, inst_binds, val_binds, const_inst_binds)
+deSugar us mod_name all_binds fo_decls
   = let
-	(us0, us0a) = splitUniqSupply us
-	(us1, us1a) = splitUniqSupply us0a
-	(us2, us2a) = splitUniqSupply us1a
-	(us3, us3a) = splitUniqSupply us2a
-	(us4, us5)  = splitUniqSupply us3a
+	(us1, us2) = splitUniqSupply us
+	(us3, us4) = splitUniqSupply us2
 
-
-	module_and_group = (mod_name, grp_name)
+        module_and_group = (mod_name, grp_name)
 	grp_name  = case opt_SccGroup of
 		    	Just xx -> _PK_ xx
 		    	Nothing -> mod_name	-- default: module name
 
-	(core_const_binds, shadows1)
-	    = initDs us0 nullIdEnv mod_name (dsBinds const_inst_binds)
-	core_const_prs = pairsFromCoreBinds core_const_binds
-
-	(core_clas_binds, shadows2)
-			= initDs us1 nullIdEnv mod_name (dsBinds clas_binds)
-	core_clas_prs	= pairsFromCoreBinds core_clas_binds
-
-	(core_inst_binds, shadows3)
-			= initDs us2 nullIdEnv mod_name (dsBinds inst_binds)
-	core_inst_prs	= pairsFromCoreBinds core_inst_binds
-
-	(core_val_binds, shadows4)
-			= initDs us3 nullIdEnv mod_name (dsBinds val_binds)
-	core_val_pairs	= map (addAutoScc module_and_group) (pairsFromCoreBinds core_val_binds)
+	(core_prs, ds_warns) = initDs us1 nullIdEnv module_and_group 
+			       (dsMonoBinds opt_SccProfilingOn all_binds [])
 
-	(core_recsel_binds, shadows5)
-			= initDs us4 nullIdEnv mod_name (dsBinds recsel_binds)
-	core_recsel_prs	= pairsFromCoreBinds core_recsel_binds
+	((fi_binds, fe_binds, hc_code, h_code, c_code), ds_warns2) = 
+	           initDs us3 nullIdEnv module_and_group 
+			 (dsForeigns fo_decls)
 
-    	final_binds
-	  = if (null core_clas_prs && null core_inst_prs
-	     && null core_recsel_prs {-???dont know???-} && 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 ++ core_recsel_prs)]
-
-	lift_final_binds = liftCoreBindings us5 final_binds
-
-	really_final_binds = if opt_DoCoreLinting
-			     then lintCoreBindings PprDebug "Desugarer" False lift_final_binds
-			     else lift_final_binds
-
-	shadows = shadows1 `unionBags` shadows2 `unionBags`
-		  shadows3 `unionBags` shadows4 `unionBags` shadows5
+	ds_binds' = liftCoreBindings us4 [Rec (core_prs)]
+	ds_binds  = fi_binds ++ ds_binds' ++ fe_binds
     in
-    (really_final_binds, shadows)
-\end{code}
 
+	-- Display any warnings
+    doIfSet (not (isEmptyBag ds_warns))
+	(printErrs (pprDsWarnings ds_warns)) >>
 
-%************************************************************************
-%*									*
-\subsection[addAutoScc]{Adding automatic sccs}
-%*									*
-%************************************************************************
+	-- Lint result if necessary
+    lintCoreBindings "Desugarer" False ds_binds >>
 
-\begin{code}
-addAutoScc :: (FAST_STRING, FAST_STRING)	-- Module and group
-	   -> (Id, CoreExpr)
-	   -> (Id,CoreExpr)
-
-addAutoScc (mod, grp) pair@(bndr, core_expr)
-  | worthSCC core_expr &&
-    (opt_AutoSccsOnAllToplevs ||
-     (isExported bndr && opt_AutoSccsOnExportedToplevs))
-  = (bndr, SCC (mkAutoCC bndr mod grp IsNotCafCC) core_expr)
-
-  | otherwise
-  = pair
-
-worthSCC (SCC _ _) = False
-worthSCC (Con _ _) = False
-worthSCC core_expr = True
+	-- Dump output
+    dumpIfSet opt_D_dump_ds "Desugared:"
+	(pprCoreBindings ds_binds)	>>
+
+    return (ds_binds, hc_code, h_code, c_code)
 \end{code}