[project @ 1997-03-14 07:52:06 by simonpj]

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

diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs
index 697c32d..40e3bcc 100644 (file)
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/ghc/compiler/deSugar/Desugar.lhs
@@ -6,23 +6,28 @@
 \begin{code}
 #include "HsVersions.h"
 
-module Desugar ( deSugar, DsMatchContext, pprDsWarnings ) where
+module Desugar ( deSugar, DsMatchContext, pprDsWarnings, 
+                 DsWarnFlavour -- removed when compiling with 1.4
+              ) where
 
 IMP_Ubiq(){-uitous-}
 
 import HsSyn           ( HsBinds, HsExpr )
 import TcHsSyn         ( SYN_IE(TypecheckedHsBinds), SYN_IE(TypecheckedHsExpr) )
 import CoreSyn
-
+import Name             ( isExported )
 import DsMonad
 import DsBinds         ( dsBinds, dsInstBinds )
 import DsUtils
 
 import Bag             ( unionBags )
-import CmdLineOpts     ( opt_DoCoreLinting, opt_AutoSccsOnAllToplevs, opt_AutoSccsOnExportedToplevs )
+import CmdLineOpts     ( opt_DoCoreLinting, opt_AutoSccsOnAllToplevs, 
+                         opt_AutoSccsOnExportedToplevs, opt_SccGroup
+                          )
+import CostCentre       ( IsCafCC(..), mkAutoCC )
 import CoreLift                ( liftCoreBindings )
 import CoreLint                ( lintCoreBindings )
-import Id              ( nullIdEnv, mkIdEnv )
+import Id              ( nullIdEnv, mkIdEnv, idType, SYN_IE(DictVar), GenId )
 import PprStyle                ( PprStyle(..) )
 import UniqSupply      ( splitUniqSupply )
 \end{code}
@@ -42,7 +47,7 @@ deSugar :: UniqSupply         -- name supply
 -- ToDo: handling of const_inst thingies is certainly WRONG ***************************
 
        -> ([CoreBinding],      -- output
-           Bag DsMatchContext) -- Shadowing complaints
+           DsWarnings)     -- Shadowing complaints
 
 deSugar us mod_name (recsel_binds, clas_binds, inst_binds, val_binds, const_inst_pairs)
   = let
@@ -52,9 +57,11 @@ deSugar us mod_name (recsel_binds, clas_binds, inst_binds, val_binds, const_inst
        (us3, us3a) = splitUniqSupply us2a
        (us4, us5)  = splitUniqSupply us3a
 
-       auto_meth = opt_AutoSccsOnAllToplevs 
-       auto_top  = opt_AutoSccsOnAllToplevs
-                   || opt_AutoSccsOnExportedToplevs
+
+       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_prs, consts_pairs), shadows1)
            = initDs us0 nullIdEnv mod_name (dsInstBinds [] const_inst_pairs)
@@ -62,19 +69,19 @@ deSugar us mod_name (recsel_binds, clas_binds, inst_binds, val_binds, const_inst
        consts_env = mkIdEnv consts_pairs
 
        (core_clas_binds, shadows2)
-                       = initDs us1 consts_env mod_name (dsBinds False 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 mod_name (dsBinds auto_meth 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 mod_name (dsBinds auto_top val_binds)
-       core_val_pairs  = pairsFromCoreBinds core_val_binds
+                       = initDs us3 consts_env mod_name (dsBinds val_binds)
+       core_val_pairs  = map (addAutoScc module_and_group) (pairsFromCoreBinds core_val_binds)
 
        (core_recsel_binds, shadows5)
-                       = initDs us4 consts_env mod_name (dsBinds ({-trace "Desugar:core_recsel_binds"-} False) recsel_binds)
+                       = initDs us4 consts_env mod_name (dsBinds recsel_binds)
        core_recsel_prs = pairsFromCoreBinds core_recsel_binds
 
        final_binds
@@ -98,3 +105,29 @@ deSugar us mod_name (recsel_binds, clas_binds, inst_binds, val_binds, const_inst
     in
     (really_final_binds, shadows)
 \end{code}
+
+
+%************************************************************************
+%*                                                                     *
+\subsection[addAutoScc]{Adding automatic sccs}
+%*                                                                     *
+%************************************************************************
+
+\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
+\end{code}