mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Doh! Of couse we cannot memoize across scopes.

Browse source
This commit is contained in:
Eelco Dolstra 2006-07-11 10:29:52 +00:00
parent 2b4b0658fa
commit e10b830251
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libexpr/nixexpr.cc
View file

@ -229,16 +229,19 @@ static void checkVarDefs2(set<Expr> & done, const ATermMap & defs, Expr e)
} }
for (ATermIterator i(formals); i; ++i) { for (ATermIterator i(formals); i; ++i) {
Expr deflt; Expr deflt;
set<Expr> done2;
if (matchDefFormal(*i, name, deflt)) if (matchDefFormal(*i, name, deflt))
checkVarDefs2(done, defs2, deflt); checkVarDefs2(done2, defs2, deflt);
} }
checkVarDefs2(done, defs2, body); set<Expr> done2;
checkVarDefs2(done2, defs2, body);
} }
else if (matchFunction1(e, name, body, pos)) { else if (matchFunction1(e, name, body, pos)) {
ATermMap defs2(defs); ATermMap defs2(defs);
defs2.set(name, (ATerm) ATempty); defs2.set(name, (ATerm) ATempty);
checkVarDefs2(done, defs2, body); set<Expr> done2;
checkVarDefs2(done2, defs2, body);
} }
else if (matchRec(e, rbnds, nrbnds)) { else if (matchRec(e, rbnds, nrbnds)) {
@ -252,7 +255,8 @@ static void checkVarDefs2(set<Expr> & done, const ATermMap & defs, Expr e)
if (!matchBind(*i, name, value, pos)) abort(); /* can't happen */ if (!matchBind(*i, name, value, pos)) abort(); /* can't happen */
defs2.set(name, (ATerm) ATempty); defs2.set(name, (ATerm) ATempty);
} }
checkVarDefs2(done, defs2, (ATerm) rbnds); set<Expr> done2;
checkVarDefs2(done2, defs2, (ATerm) rbnds);
} }
else if (matchWith(e, with, body, pos)) { else if (matchWith(e, with, body, pos)) {