From efe4b690ae4de5f0adea99abb1176a64a099d433 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 14 Aug 2008 10:04:22 +0000 Subject: * Refactoring: combine functions that take an attribute set and functions that take a single argument (plain lambdas) into one AST node (Function) that contains a Pattern node describing the arguments. Current patterns are single lazy arguments (VarPat) and matching against an attribute set (AttrsPat). This refactoring allows other kinds of patterns to be added easily, such as Haskell-style @-patterns, or list pattern matching. --- src/libexpr/primops.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/libexpr/primops.cc') diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index c747f46c46..50a6416700 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -120,11 +120,9 @@ static Expr prim_isNull(EvalState & state, const ATermVector & args) static Expr prim_isFunction(EvalState & state, const ATermVector & args) { Expr e = evalExpr(state, args[0]); - ATermList formals; - ATerm name, body, pos; - return makeBool( - matchFunction(e, formals, body, pos) || - matchFunction1(e, name, body, pos)); + Pattern pat; + ATerm body, pos; + return makeBool(matchFunction(e, pat, body, pos)); } -- cgit 1.4.1