wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 14:51:16 +02:00
Code Activity

* Refactoring to support domain checks.

Browse source
This commit is contained in:
Eelco Dolstra 2006-07-24 15:16:03 +00:00
parent 9c3099d328
commit 57751fdb55
10 changed files with 36 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libexpr/nixexpr.cc
View file

@ -134,9 +134,8 @@ Expr substitute(const Substitution & subs, Expr e)
if (matchFunction(e, formals, body, pos)) {
ATermMap map(ATgetLength(formals));
for (ATermIterator i(formals); i; ++i) {
if (!matchNoDefFormal(*i, name) &&
!matchDefFormal(*i, name, def))
abort();
ATerm d1, d2;
if (!matchFormal(*i, name, d1, d2)) abort();
map.set(name, makeRemoved());
}
Substitution subs2(&subs, &map);
@ -221,16 +220,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) {
Expr deflt;
if (!matchNoDefFormal(*i, name) &&
!matchDefFormal(*i, name, deflt))
abort();
Expr d1, d2;
if (!matchFormal(*i, name, d1, d2)) abort();
defs2.set(name, (ATerm) ATempty);
}
for (ATermIterator i(formals); i; ++i) {
Expr deflt;
Expr dummy, deflt;
set<Expr> done2;
if (matchDefFormal(*i, name, deflt))
if (matchFormal(*i, name, dummy, deflt)) /* !!! check dummy */
checkVarDefs2(done2, defs2, deflt);
}
set<Expr> done2;