aleksanaa/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Function() takes a list of formals.

Browse source
This commit is contained in:
Eelco Dolstra 2003-08-14 09:49:31 +00:00
parent 0a2de7f543
commit 5cde23f869
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/fix.cc
View file

@ -53,10 +53,18 @@ static Expr substExpr(string x, Expr rep, Expr e)
else else
return e; return e;
if (ATmatch(e, "Function(<str>, <term>)", &s, &e2)) ATermList formals;
if (x == s) if (ATmatch(e, "Function([<list>], <term>)", &formals, &e2)) {
return e; while (!ATisEmpty(formals)) {
/* !!! unfair substitutions */ if (!ATmatch(ATgetFirst(formals), "<str>", &s))
throw badTerm("not a list of formals", (ATerm) formals);
if (x == (string) s)
return e;
formals = ATgetNext(formals);
}
}
/* ??? unfair substitutions? */
/* Generically substitute in subterms. */ /* Generically substitute in subterms. */
@ -332,6 +340,8 @@ static Expr evalExpr2(EvalState & state, Expr e)
static Expr evalExpr(EvalState & state, Expr e) static Expr evalExpr(EvalState & state, Expr e)
{ {
Nest nest(lvlVomit, format("evaluating expression: %1%") % printTerm(e));
/* Consult the memo table to quickly get the normal form of /* Consult the memo table to quickly get the normal form of
previously evaluated expressions. */ previously evaluated expressions. */
NormalForms::iterator i = state.normalForms.find(e); NormalForms::iterator i = state.normalForms.find(e);