X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDesugar.lhs;h=5cece7ac4d6b4c85e5eab7c1dedcb4f8f20a46a9;hb=7d841483081735f5f906a6bb5e80249d97f3226b;hp=26ff4d2837eea20261c22f67b67c606e9611d98a;hpb=69e14f75a4b031e489b7774914e5a176409cea78;p=ghc-hetmet.git diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs index 26ff4d2..5cece7a 100644 --- a/ghc/compiler/deSugar/Desugar.lhs +++ b/ghc/compiler/deSugar/Desugar.lhs @@ -4,36 +4,37 @@ \section[Desugar]{@deSugar@: the main function} \begin{code} -module Desugar ( deSugar ) where +module Desugar ( deSugar, deSugarExpr ) where #include "HsVersions.h" -import CmdLineOpts ( opt_D_dump_ds ) -import HsSyn ( MonoBinds, RuleDecl(..), RuleBndr(..), HsExpr(..), HsBinds(..), MonoBinds(..) ) -import HsCore ( UfRuleBody(..) ) -import TcHsSyn ( TypecheckedMonoBinds, TypecheckedForeignDecl, TypecheckedRuleDecl ) +import CmdLineOpts ( DynFlags, DynFlag(..), dopt, opt_SccProfilingOn ) +import HscTypes ( ModDetails(..) ) +import HsSyn ( MonoBinds, RuleDecl(..), RuleBndr(..), + HsExpr(..), HsBinds(..), MonoBinds(..) ) +import TcHsSyn ( TypecheckedRuleDecl, TypecheckedHsExpr ) import TcModule ( TcResults(..) ) +import Id ( Id ) import CoreSyn -import Rules ( ProtoCoreRule(..), pprProtoCoreRule ) -import Subst ( substExpr, mkSubst ) +import PprCore ( pprIdRules, pprCoreExpr ) +import Subst ( substExpr, mkSubst, mkInScopeSet ) import DsMonad import DsExpr ( dsExpr ) import DsBinds ( dsMonoBinds, AutoScc(..) ) import DsForeign ( dsForeigns ) -import DsUtils import DsExpr () -- Forces DsExpr to be compiled; DsBinds only -- depends on DsExpr.hi-boot. -import Module ( Module, moduleString ) +import Module ( Module ) import Id ( Id ) -import Name ( isLocallyDefined ) +import NameEnv ( lookupNameEnv ) import VarEnv import VarSet -import Bag ( isEmptyBag, unionBags ) -import CmdLineOpts ( opt_SccGroup, opt_SccProfilingOn ) -import CoreLint ( beginPass, endPass ) -import ErrUtils ( doIfSet, pprBagOfWarnings ) +import Bag ( isEmptyBag ) +import CoreLint ( showPass, endPass ) +import ErrUtils ( doIfSet, dumpIfSet_dyn, pprBagOfWarnings ) import Outputable -import UniqSupply ( splitUniqSupply, UniqSupply ) +import UniqSupply ( mkSplitUniqSupply ) +import HscTypes ( HomeSymbolTable, PersistentCompilerState(..), TyThing(..), lookupType, ) \end{code} %************************************************************************ @@ -46,46 +47,102 @@ The only trick here is to get the @DsMonad@ stuff off to a good start. \begin{code} -deSugar :: Module - -> UniqSupply +deSugar :: DynFlags + -> PersistentCompilerState -> HomeSymbolTable + -> Module -> PrintUnqualified -> TcResults - -> IO ([CoreBind], [ProtoCoreRule], SDoc, SDoc) - -deSugar mod_name us (TcResults {tc_env = global_val_env, - tc_binds = all_binds, - tc_rules = rules, - tc_fords = fo_decls}) - = do - beginPass "Desugar" + -> IO (ModDetails, (SDoc, SDoc, [FAST_STRING], [CoreBndr])) + +deSugar dflags pcs hst mod_name unqual + (TcResults {tc_env = type_env, + tc_binds = all_binds, + tc_insts = insts, + tc_rules = rules, + tc_fords = fo_decls}) + = do { showPass dflags "Desugar" + ; us <- mkSplitUniqSupply 'd' + -- Do desugaring - let (result, ds_warns) = initDs us global_val_env module_and_group - (dsProgram mod_name all_binds rules fo_decls) - (ds_binds, ds_rules, _, _) = result + ; let (ds_result, ds_warns) = initDs dflags us lookup mod_name + (dsProgram mod_name all_binds rules fo_decls) + + (ds_binds, ds_rules, foreign_stuff) = ds_result + + mod_details = ModDetails { md_types = type_env, + md_insts = insts, + md_rules = ds_rules, + md_binds = ds_binds } + + -- Display any warnings + ; doIfSet (not (isEmptyBag ds_warns)) + (printErrs unqual (pprBagOfWarnings ds_warns)) + + -- Lint result if necessary + ; endPass dflags "Desugar" Opt_D_dump_ds ds_binds - -- Display any warnings - doIfSet (not (isEmptyBag ds_warns)) - (printErrs (pprBagOfWarnings ds_warns)) + -- Dump output + ; doIfSet (dopt Opt_D_dump_ds dflags) + (printDump (ppr_ds_rules ds_rules)) - -- Lint result if necessary - endPass "Desugar" opt_D_dump_ds ds_binds + ; return (mod_details, foreign_stuff) + } - doIfSet opt_D_dump_ds (printDump (ppr_ds_rules ds_rules)) + where + -- The lookup function passed to initDs is used for well-known Ids, + -- such as fold, build, cons etc, so the chances are + -- it'll be found in the package symbol table. That's + -- why we don't merge all these tables + pte = pcs_PTE pcs + lookup n = case lookupType hst pte n of { + Just (AnId v) -> v ; + other -> + case lookupNameEnv type_env n of + Just (AnId v) -> v ; + other -> pprPanic "Desugar: lookup:" (ppr n) + } + +deSugarExpr :: DynFlags + -> PersistentCompilerState -> HomeSymbolTable + -> Module -> PrintUnqualified + -> TypecheckedHsExpr + -> IO CoreExpr +deSugarExpr dflags pcs hst mod_name unqual tc_expr + = do { showPass dflags "Desugar" + ; us <- mkSplitUniqSupply 'd' + + -- Do desugaring + ; let (core_expr, ds_warns) = initDs dflags us lookup mod_name (dsExpr tc_expr) + + -- Display any warnings + ; doIfSet (not (isEmptyBag ds_warns)) + (printErrs unqual (pprBagOfWarnings ds_warns)) - return result + -- Dump output + ; dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared" (pprCoreExpr core_expr) + + ; return core_expr + } where - module_and_group = (mod_name, grp_name) - grp_name = case opt_SccGroup of - Just xx -> _PK_ xx - Nothing -> _PK_ (moduleString mod_name) -- default: module name + pte = pcs_PTE pcs + lookup n = case lookupType hst pte n of + Just (AnId v) -> v + other -> pprPanic "Desugar: lookup:" (ppr n) dsProgram mod_name all_binds rules fo_decls = dsMonoBinds auto_scc all_binds [] `thenDs` \ core_prs -> - dsForeigns mod_name fo_decls `thenDs` \ (fi_binds, fe_binds, h_code, c_code) -> - mapDs dsRule rules `thenDs` \ rules' -> - let - ds_binds = fi_binds ++ [Rec core_prs] ++ fe_binds + dsForeigns mod_name fo_decls `thenDs` \ (fe_binders, foreign_binds, h_code, c_code, headers) -> + let + ds_binds = [Rec (foreign_binds ++ core_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# + -- we want F# to be in scope in the foreign marshalling code! + -- You might think it doesn't matter, but the simplifier brings all top-level + -- things into the in-scope set before simplifying; so we get no unfolding for F#! + + local_binders = mkVarSet (bindersOfBinds ds_binds) in - returnDs (ds_binds, rules', h_code, c_code) + mapDs (dsRule local_binders) rules `thenDs` \ rules' -> + returnDs (ds_binds, rules', (h_code, c_code, headers, fe_binders)) where auto_scc | opt_SccProfilingOn = TopLevel | otherwise = NoSccs @@ -93,7 +150,7 @@ dsProgram mod_name all_binds rules fo_decls ppr_ds_rules [] = empty ppr_ds_rules rules = text "" $$ text "-------------- DESUGARED RULES -----------------" $$ - vcat (map pprProtoCoreRule rules) + pprIdRules rules \end{code} @@ -104,25 +161,24 @@ ppr_ds_rules rules %************************************************************************ \begin{code} -dsRule :: TypecheckedRuleDecl -> DsM ProtoCoreRule -dsRule (IfaceRuleDecl fn (CoreRuleBody name all_vars args rhs) loc) - = returnDs (ProtoCoreRule False {- non-local -} fn - (Rule name all_vars args rhs)) - -dsRule (RuleDecl name sig_tvs vars lhs rhs loc) +dsRule :: IdSet -> TypecheckedRuleDecl -> DsM (Id, CoreRule) +dsRule in_scope (IfaceRuleOut fun rule) -- Built-in rules come this way + = returnDs (fun, rule) + +dsRule in_scope (HsRule name act vars lhs rhs loc) = putSrcLocDs loc $ ds_lhs all_vars lhs `thenDs` \ (fn, args) -> dsExpr rhs `thenDs` \ core_rhs -> - returnDs (ProtoCoreRule True {- local -} fn - (Rule name all_vars args core_rhs)) + returnDs (fn, Rule name act tpl_vars args core_rhs) where - all_vars = sig_tvs ++ [var | RuleBndr var <- vars] + tpl_vars = [var | RuleBndr var <- vars] + all_vars = mkInScopeSet (in_scope `unionVarSet` mkVarSet tpl_vars) ds_lhs all_vars lhs = let (dict_binds, body) = case lhs of - (HsLet (MonoBind dict_binds _ _) body) -> (dict_binds, body) - other -> (EmptyMonoBinds, lhs) + (HsLet (MonoBind dict_binds _ _) body) -> (dict_binds, body) + other -> (EmptyMonoBinds, lhs) in ds_dict_binds dict_binds `thenDs` \ dict_binds' -> dsExpr body `thenDs` \ body' -> @@ -135,7 +191,7 @@ ds_lhs all_vars lhs -- Note recursion here... substitution won't terminate -- if there is genuine recursion... which there isn't - subst = mkSubst (mkVarSet all_vars) subst_env + subst = mkSubst all_vars subst_env body'' = substExpr subst body' in