projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
08579b1
)
Fix a bug in the in-scope set that led to some lookupIdSubst errors
author
simonpj@microsoft.com
<unknown>
Tue, 15 Dec 2009 16:02:16 +0000
(16:02 +0000)
committer
simonpj@microsoft.com
<unknown>
Tue, 15 Dec 2009 16:02:16 +0000
(16:02 +0000)
compiler/coreSyn/CoreUnfold.lhs
patch
|
blob
|
history
diff --git
a/compiler/coreSyn/CoreUnfold.lhs
b/compiler/coreSyn/CoreUnfold.lhs
index
1ff037f
..
798d94b
100644
(file)
--- a/
compiler/coreSyn/CoreUnfold.lhs
+++ b/
compiler/coreSyn/CoreUnfold.lhs
@@
-1181,9
+1181,6
@@
exprIsConApp_maybe id_unf expr
analyse _ _ = Nothing
-----------
analyse _ _ = Nothing
-----------
- in_scope = mkInScopeSet (exprFreeVars expr)
-
- -----------
beta (Lam v body) pairs (arg : args)
| isTypeArg arg
= beta body ((v,arg):pairs) args
beta (Lam v body) pairs (arg : args)
| isTypeArg arg
= beta body ((v,arg):pairs) args
@@
-1198,7
+1195,7
@@
exprIsConApp_maybe id_unf expr
Just ans -> -- pprTrace "Woo-hoo! exprIsConApp_maybe" doc $
Just ans
where
Just ans -> -- pprTrace "Woo-hoo! exprIsConApp_maybe" doc $
Just ans
where
- subst = mkOpenSubst in_scope pairs
+ subst = mkOpenSubst (mkInScopeSet (exprFreeVars fun)) pairs
-- doc = vcat [ppr fun, ppr expr, ppr pairs, ppr args]
-- doc = vcat [ppr fun, ppr expr, ppr pairs, ppr args]