#include "HsVersions.h"
import CmdLineOpts ( DynFlags, DynFlag(..), dopt, opt_SccProfilingOn )
+import HscTypes ( ModDetails(..) )
import HsSyn ( MonoBinds, RuleDecl(..), RuleBndr(..),
HsExpr(..), HsBinds(..), MonoBinds(..) )
import TcHsSyn ( TypecheckedRuleDecl, TypecheckedHsExpr )
-- depends on DsExpr.hi-boot.
import Module ( Module )
import Id ( Id )
-import Name ( lookupNameEnv )
+import NameEnv ( lookupNameEnv )
import VarEnv
import VarSet
import Bag ( isEmptyBag )
import CoreLint ( showPass, endPass )
-import ErrUtils ( doIfSet, pprBagOfWarnings )
+import ErrUtils ( doIfSet, dumpIfSet_dyn, pprBagOfWarnings )
import Outputable
import UniqSupply ( mkSplitUniqSupply )
import HscTypes ( HomeSymbolTable, PersistentCompilerState(..), TyThing(..), lookupType, )
-> PersistentCompilerState -> HomeSymbolTable
-> Module -> PrintUnqualified
-> TcResults
- -> IO ([CoreBind], [(Id,CoreRule)], (SDoc, SDoc, [CoreBndr]))
+ -> IO (ModDetails, (SDoc, SDoc, [CoreBndr]))
deSugar dflags pcs hst mod_name unqual
- (TcResults {tc_env = local_type_env,
+ (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 dflags us lookup mod_name
- (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))
; doIfSet (dopt Opt_D_dump_ds dflags)
(printDump (ppr_ds_rules ds_rules))
- ; return result
+ ; return (mod_details, foreign_stuff)
}
where
lookup n = case lookupType hst pte n of {
Just (AnId v) -> v ;
other ->
- case lookupNameEnv local_type_env n of
+ case lookupNameEnv type_env n of
Just (AnId v) -> v ;
other -> pprPanic "Desugar: lookup:" (ppr n)
}
(printErrs unqual (pprBagOfWarnings ds_warns))
-- Dump output
- ; let do_dump_ds = dopt Opt_D_dump_ds dflags
- ; doIfSet do_dump_ds (printDump (pprCoreExpr core_expr))
+ ; dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared" (pprCoreExpr core_expr)
; return core_expr
}
\begin{code}
dsRule :: IdSet -> TypecheckedRuleDecl -> DsM (Id, CoreRule)
-dsRule in_scope (HsRule name sig_tvs vars lhs rhs loc)
+dsRule in_scope (HsRule name act sig_tvs vars lhs rhs loc)
= putSrcLocDs loc $
ds_lhs all_vars lhs `thenDs` \ (fn, args) ->
dsExpr rhs `thenDs` \ core_rhs ->
- returnDs (fn, Rule name tpl_vars args core_rhs)
+ returnDs (fn, Rule name act tpl_vars args core_rhs)
where
tpl_vars = sig_tvs ++ [var | RuleBndr var <- vars]
all_vars = mkInScopeSet (in_scope `unionVarSet` mkVarSet tpl_vars)