From 57751fdb55ad04d82542165417511d26304cadc2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Jul 2006 15:16:03 +0000 Subject: * Refactoring to support domain checks. --- src/libexpr/parser.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/libexpr/parser.cc') diff --git a/src/libexpr/parser.cc b/src/libexpr/parser.cc index 5c2c85cd73af..7adbcb618e8c 100644 --- a/src/libexpr/parser.cc +++ b/src/libexpr/parser.cc @@ -118,10 +118,8 @@ static void checkAttrSets(ATerm e) ATermMap names(ATgetLength(formals)); for (ATermIterator i(formals); i; ++i) { ATerm name; - Expr deflt; - if (!matchNoDefFormal(*i, name) && - !matchDefFormal(*i, name, deflt)) - abort(); + ATerm d1, d2; + if (!matchFormal(*i, name, d1, d2)) abort(); if (names.get(name)) throw EvalError(format("duplicate formal function argument `%1%' at %2%") % aterm2String(name) % showPos(pos)); -- cgit 1.4.1