From 5664b6d7ba28453ccdd6d1c07a707f98608500ff Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Aug 2008 13:36:40 +0000 Subject: * Removed the "valid values" feature. Nobody uses it anyway. --- src/libexpr/nixexpr.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/libexpr/nixexpr.cc') diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc index 0f5ec030654f..310f714718fe 100644 --- a/src/libexpr/nixexpr.cc +++ b/src/libexpr/nixexpr.cc @@ -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 & 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 done2; - if (!matchFormal(*i, name, valids, deflt)) abort(); - checkVarDefs2(done, defs, valids); + if (!matchFormal(*i, name, deflt)) abort(); checkVarDefs2(done2, defs2, deflt); } set done2; -- cgit 1.4.1