X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FdeSugar%2FDesugar.lhs;h=ab4ee74b4123dbb01524527c794244d6e94d79b2;hp=7b3847ecdec53583d433a892c49e190273919ca7;hb=311b1cdfc9b1c311cc53482c461c18cba8885b2a;hpb=61d2625ae2e6a4cdae2ffc92df828905e81c24cc diff --git a/compiler/deSugar/Desugar.lhs b/compiler/deSugar/Desugar.lhs index 7b3847e..ab4ee74 100644 --- a/compiler/deSugar/Desugar.lhs +++ b/compiler/deSugar/Desugar.lhs @@ -1,51 +1,49 @@ % +% (c) The University of Glasgow 2006 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 % -\section[Desugar]{@deSugar@: the main function} + +The Desugarer: turning HsSyn into Core. \begin{code} module Desugar ( deSugar, deSugarExpr ) where #include "HsVersions.h" -import DynFlags ( DynFlag(..), DynFlags(..), dopt, GhcMode(..) ) -import StaticFlags ( opt_SccProfilingOn ) -import DriverPhases ( isHsBoot ) -import HscTypes ( ModGuts(..), HscEnv(..), - Dependencies(..), ForeignStubs(..), TypeEnv, IsBootInterface ) -import HsSyn ( RuleDecl(..), RuleBndr(..), LHsExpr, LRuleDecl ) -import TcRnTypes ( TcGblEnv(..), ImportAvails(..) ) -import MkIface ( mkUsageInfo ) -import Id ( Id, setIdExported, idName ) -import Name ( Name, isExternalName, nameIsLocalOrFrom, nameOccName ) +import DynFlags +import StaticFlags +import HscTypes +import HsSyn +import TcRnTypes +import MkIface +import Id +import Name import CoreSyn -import PprCore ( pprRules, pprCoreExpr ) +import PprCore import DsMonad -import DsExpr ( dsLExpr ) -import DsBinds ( dsTopLHsBinds, decomposeRuleLhs, AutoScc(..) ) -import DsForeign ( dsForeigns ) +import DsExpr +import DsBinds +import DsForeign import DsExpr () -- Forces DsExpr to be compiled; DsBinds only -- depends on DsExpr.hi-boot. import Module -import UniqFM ( eltsUFM, delFromUFM ) -import PackageConfig ( thPackageId ) -import RdrName ( GlobalRdrEnv ) +import UniqFM +import PackageConfig +import RdrName import NameSet import VarSet -import Bag ( Bag, isEmptyBag, emptyBag ) -import Rules ( roughTopNames ) -import CoreLint ( showPass, endPass ) -import CoreFVs ( ruleRhsFreeVars, exprsFreeNames ) -import ErrUtils ( doIfSet, dumpIfSet_dyn, printBagOfWarnings, - errorsFound, WarnMsg ) -import ListSetOps ( insertList ) +import Rules +import CoreLint +import CoreFVs +import ErrUtils +import ListSetOps import Outputable -import UniqSupply ( mkSplitUniqSupply ) -import SrcLoc ( Located(..) ) -import DATA_IOREF ( readIORef ) -import Maybes ( catMaybes ) +import SrcLoc +import Maybes import FastString -import Util ( sortLe ) +import Util + +import Data.IORef \end{code} %************************************************************************ @@ -55,7 +53,7 @@ import Util ( sortLe ) %************************************************************************ \begin{code} -deSugar :: HscEnv -> TcGblEnv -> IO (Bag WarnMsg, Maybe ModGuts) +deSugar :: HscEnv -> TcGblEnv -> IO (Maybe ModGuts) -- Can modify PCS by faulting in more declarations deSugar hsc_env @@ -74,13 +72,16 @@ deSugar hsc_env tcg_binds = binds, tcg_fords = fords, tcg_rules = rules, - tcg_insts = insts }) + tcg_insts = insts, + tcg_fam_insts = fam_insts }) = do { showPass dflags "Desugar" -- Desugar the program - ; ((all_prs, ds_rules, ds_fords), warns) - <- case ghcMode (hsc_dflags hsc_env) of - JustTypecheck -> return (([], [], NoStubs), emptyBag) + ; let export_set = availsToNameSet exports + ; let auto_scc = mkAutoScc mod export_set + + ; mb_res <- case ghcMode dflags of + JustTypecheck -> return (Just ([], [], NoStubs)) _ -> initDs hsc_env mod rdr_env type_env $ do { core_prs <- dsTopLHsBinds auto_scc binds ; (ds_fords, foreign_prs) <- dsForeigns fords @@ -89,16 +90,14 @@ deSugar hsc_env ; ds_rules <- mappM (dsRule mod local_bndrs) rules ; return (all_prs, catMaybes ds_rules, ds_fords) } - - -- If warnings are considered errors, leave. - ; if errorsFound dflags (warns, emptyBag) - then return (warns, Nothing) - else do + ; case mb_res of { + Nothing -> return Nothing ; + Just (all_prs, ds_rules, ds_fords) -> do { -- Add export flags to bindings keep_alive <- readIORef keep_var - ; let final_prs = addExportFlags ghci_mode exports keep_alive - all_prs ds_rules + ; let final_prs = addExportFlags ghci_mode export_set + keep_alive all_prs ds_rules ds_binds = [Rec final_prs] -- Notice that we put the whole lot in a big Rec, even the foreign binds -- When compiling PrelFloat, which defines data Float = F# Float# @@ -129,12 +128,8 @@ deSugar hsc_env dir_imp_mods = imp_mods imports - ; showPass dflags "Desugar 3" - ; usages <- mkUsageInfo hsc_env dir_imp_mods dep_mods used_names - ; showPass dflags "Desugar 4" - ; let -- Modules don't compare lexicographically usually, -- but we want them to do so here. @@ -144,61 +139,70 @@ deSugar hsc_env le_dep_mod :: (ModuleName, IsBootInterface) -> (ModuleName, IsBootInterface) -> Bool le_dep_mod (m1,_) (m2,_) = moduleNameFS m1 <= moduleNameFS m2 - deps = Deps { dep_mods = sortLe le_dep_mod dep_mods, - dep_pkgs = sortLe (<=) pkgs, - dep_orphs = sortLe le_mod (imp_orphs imports) } + deps = Deps { dep_mods = sortLe le_dep_mod dep_mods, + dep_pkgs = sortLe (<=) pkgs, + dep_orphs = sortLe le_mod (imp_orphs imports), + dep_finsts = sortLe le_mod (imp_finsts imports) } -- sort to get into canonical order mod_guts = ModGuts { - mg_module = mod, - mg_boot = isHsBoot hsc_src, - mg_exports = exports, - mg_deps = deps, - mg_usages = usages, - mg_dir_imps = [m | (m,_,_) <- moduleEnvElts dir_imp_mods], - mg_rdr_env = rdr_env, - mg_fix_env = fix_env, - mg_deprecs = deprecs, - mg_types = type_env, - mg_insts = insts, - mg_rules = ds_rules, - mg_binds = ds_binds, - mg_foreign = ds_fords } + mg_module = mod, + mg_boot = isHsBoot hsc_src, + mg_exports = exports, + mg_deps = deps, + mg_usages = usages, + mg_dir_imps = [m | (m,_,_) <- moduleEnvElts dir_imp_mods], + mg_rdr_env = rdr_env, + mg_fix_env = fix_env, + mg_deprecs = deprecs, + mg_types = type_env, + mg_insts = insts, + mg_fam_insts = fam_insts, + mg_rules = ds_rules, + mg_binds = ds_binds, + mg_foreign = ds_fords } - ; return (warns, Just mod_guts) - }} + ; return (Just mod_guts) + }}} where - dflags = hsc_dflags hsc_env - ghci_mode = ghcMode (hsc_dflags hsc_env) - auto_scc | opt_SccProfilingOn = TopLevel - | otherwise = NoSccs + dflags = hsc_dflags hsc_env + ghci_mode = ghcMode (hsc_dflags hsc_env) + +mkAutoScc :: Module -> NameSet -> AutoScc +mkAutoScc mod exports + | not opt_SccProfilingOn -- No profiling + = NoSccs + | opt_AutoSccsOnAllToplevs -- Add auto-scc on all top-level things + = AddSccs mod (\id -> True) + | opt_AutoSccsOnExportedToplevs -- Only on exported things + = AddSccs mod (\id -> idName id `elemNameSet` exports) + | otherwise + = NoSccs + deSugarExpr :: HscEnv -> Module -> GlobalRdrEnv -> TypeEnv -> LHsExpr Id - -> IO CoreExpr + -> IO (Maybe CoreExpr) +-- Prints its own errors; returns Nothing if error occurred + deSugarExpr hsc_env this_mod rdr_env type_env tc_expr - = do { showPass dflags "Desugar" - ; us <- mkSplitUniqSupply 'd' + = do { let dflags = hsc_dflags hsc_env + ; showPass dflags "Desugar" -- Do desugaring - ; (core_expr, ds_warns) <- initDs hsc_env this_mod rdr_env type_env $ - dsLExpr tc_expr + ; mb_core_expr <- initDs hsc_env this_mod rdr_env type_env $ + dsLExpr tc_expr - -- Display any warnings - -- Note: if -Werror is used, we don't signal an error here. - ; doIfSet (not (isEmptyBag ds_warns)) - (printBagOfWarnings dflags ds_warns) + ; case mb_core_expr of { + Nothing -> return Nothing ; + Just expr -> do { - -- Dump output - ; dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared" (pprCoreExpr core_expr) - - ; return core_expr - } - where - dflags = hsc_dflags hsc_env + -- Dump output + dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared" (pprCoreExpr expr) + ; return (Just expr) } } } -- addExportFlags -- Set the no-discard flag if either @@ -271,7 +275,7 @@ dsRule mod in_scope (L loc (HsRule name act vars lhs tv_lhs rhs fv_rhs)) ; rhs' <- dsLExpr rhs ; case decomposeRuleLhs bndrs lhs' of { - Nothing -> do { dsWarn msg; return Nothing } ; + Nothing -> do { warnDs msg; return Nothing } ; Just (bndrs', fn_id, args) -> do -- Substitute the dict bindings eagerly, @@ -283,6 +287,9 @@ dsRule mod in_scope (L loc (HsRule name act vars lhs tv_lhs rhs fv_rhs)) lhs_names = fn_name : nameSetToList (exprsFreeNames args) -- No need to delete bndrs, because -- exprsFreeNames finds only External names + + -- A rule is an orphan only if none of the variables + -- mentioned on its left-hand side are locally defined orph = case filter (nameIsLocalOrFrom mod) lhs_names of (n:ns) -> Just (nameOccName n) [] -> Nothing