projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2000-10-25 13:51:50 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
5090a9e
..
70bec84
100644
(file)
--- a/
ghc/compiler/deSugar/Desugar.lhs
+++ b/
ghc/compiler/deSugar/Desugar.lhs
@@
-13,8
+13,9
@@
import HsSyn ( MonoBinds, RuleDecl(..), RuleBndr(..),
HsExpr(..), HsBinds(..), MonoBinds(..) )
import TcHsSyn ( TypecheckedRuleDecl )
import TcModule ( TcResults(..) )
HsExpr(..), HsBinds(..), MonoBinds(..) )
import TcHsSyn ( TypecheckedRuleDecl )
import TcModule ( TcResults(..) )
+import Id ( Id )
import CoreSyn
import CoreSyn
-import Rules ( ProtoCoreRule(..), pprProtoCoreRule )
+import PprCore ( pprIdCoreRule )
import Subst ( substExpr, mkSubst, mkInScopeSet )
import DsMonad
import DsExpr ( dsExpr )
import Subst ( substExpr, mkSubst, mkInScopeSet )
import DsMonad
import DsExpr ( dsExpr )
@@
-48,7
+49,7
@@
deSugar :: DynFlags
-> UniqSupply
-> HomeSymbolTable
-> TcResults
-> UniqSupply
-> HomeSymbolTable
-> TcResults
- -> IO ([CoreBind], [ProtoCoreRule], SDoc, SDoc, [CoreBndr])
+ -> IO ([CoreBind], [(Id,CoreRule)], SDoc, SDoc, [CoreBndr])
deSugar dflags mod_name us hst
(TcResults {tc_env = global_val_env,
deSugar dflags mod_name us hst
(TcResults {tc_env = global_val_env,
@@
-98,7
+99,7
@@
dsProgram mod_name all_binds rules fo_decls
ppr_ds_rules [] = empty
ppr_ds_rules rules
= text "" $$ text "-------------- DESUGARED RULES -----------------" $$
ppr_ds_rules [] = empty
ppr_ds_rules rules
= text "" $$ text "-------------- DESUGARED RULES -----------------" $$
- vcat (map pprProtoCoreRule rules)
+ vcat (map pprIdCoreRule rules)
\end{code}
\end{code}
@@
-109,16
+110,12
@@
ppr_ds_rules rules
%************************************************************************
\begin{code}
%************************************************************************
\begin{code}
-dsRule :: IdSet -> TypecheckedRuleDecl -> DsM ProtoCoreRule
-dsRule in_scope (IfaceRuleOut fn rule)
- = returnDs (ProtoCoreRule False {- non-local -} fn rule)
-
+dsRule :: IdSet -> TypecheckedRuleDecl -> DsM (Id, CoreRule)
dsRule in_scope (HsRule name sig_tvs vars lhs rhs loc)
= putSrcLocDs loc $
ds_lhs all_vars lhs `thenDs` \ (fn, args) ->
dsExpr rhs `thenDs` \ core_rhs ->
dsRule in_scope (HsRule name sig_tvs 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 tpl_vars args core_rhs))
+ returnDs (fn, Rule name tpl_vars args core_rhs)
where
tpl_vars = sig_tvs ++ [var | RuleBndr var <- vars]
all_vars = mkInScopeSet (in_scope `unionVarSet` mkVarSet tpl_vars)
where
tpl_vars = sig_tvs ++ [var | RuleBndr var <- vars]
all_vars = mkInScopeSet (in_scope `unionVarSet` mkVarSet tpl_vars)