maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Removed the "valid values" feature. Nobody uses it anyway.

Browse source
This commit is contained in:
Eelco Dolstra 2008-08-11 13:36:40 +00:00
parent b455c4c45c
commit 5664b6d7ba
13 changed files with 22 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libexpr/nixexpr.cc
View file

@ -140,8 +140,8 @@ Expr substitute(const Substitution & subs, Expr e)
if (matchFunction(e, formals, body, pos)) {
ATermMap map(ATgetLength(formals));
for (ATermIterator i(formals); i; ++i) {
ATerm d1, d2;
if (!matchFormal(*i, name, d1, d2)) abort();
ATerm d1;
if (!matchFormal(*i, name, d1)) abort();
map.set(name, makeRemoved());
}
Substitution subs2(&subs, &map);
@ -230,15 +230,14 @@ static void checkVarDefs2(set<Expr> & done, const ATermMap & defs, Expr e)
else if (matchFunction(e, formals, body, pos)) {
ATermMap defs2(defs);
for (ATermIterator i(formals); i; ++i) {
ATerm d1, d2;
if (!matchFormal(*i, name, d1, d2)) abort();
ATerm d1;
if (!matchFormal(*i, name, d1)) abort();
defs2.set(name, (ATerm) ATempty);
}
for (ATermIterator i(formals); i; ++i) {
ATerm valids, deflt;
ATerm deflt;
set<Expr> done2;
if (!matchFormal(*i, name, valids, deflt)) abort();
checkVarDefs2(done, defs, valids);
if (!matchFormal(*i, name, deflt)) abort();
checkVarDefs2(done2, defs2, deflt);
}
set<Expr> done2;