return res;
}
// return unwind(this, stack);
- // post-processor, trampoline to, args
- return [null, null, unwind(this, stack)];
+ // trampoline to, args
+ return [null, unwind(this, stack)];
};
this.eval_cbv = function (aggressive) {
return this;
var new_stack = stack.slice(0);
new_stack.unshift(this.right);
// return this.left.eval_loop(new_stack, eta);
- // post-processor, trampoline to, args
- return [null, this.left, new_stack, eta];
+ // trampoline to, args
+ return [this.left, new_stack, eta];
};
this.eval_cbv = function (aggressive) {
var left = this.left.eval_cbv(aggressive);
}
};
this.eval_loop = function (stack, eta) {
- function post(evaluated_body) {
- var term = new Lambda_lam(this.bound, evaluated_body);
+ if (stack.length === 0) {
+ // var term = new Lambda_lam(this.bound, this.body.eval_loop([], eta));
+ var term = new Lambda_lam(this.bound, reduce(this.body, eta, false));
if (eta) {
- return term.check_eta();
+ return [null, term.check_eta()];
} else {
- return term;
+ return [null, term];
}
- }
- if (stack.length === 0) {
-// var term = new Lambda_lam(this.bound, this.body.eval_loop([], eta));
-// if (eta) {
-// return term.check_eta();
-// } else {
-// return term;
-// }
- // post-processor, trampoline to, args
- return [post, this.body, [], eta];
} else {
var x = stack[0];
var xs = stack.slice(1);
// return subst(this.bound, x, this.body).eval_loop(xs, eta);
- // post-processor, trampoline to, args
- return [null, subst(this.bound, x, this.body), xs, eta];
+ // trampoline to, args
+ return [subst(this.bound, x, this.body), xs, eta];
}
};
this.eval_cbv = function (aggressive) {
return expr.eval_cbv(cbv > 1);
} else {
// return expr.eval_loop([], eta);
- var post = null, to_eval = expr, res = [[], eta];
+ var to_eval = expr, res = [[], eta];
while (to_eval !== null) {
res = to_eval.eval_loop.apply(to_eval, res);
- post = res.shift();
to_eval = res.shift();
- print(res);
- if (post) {
- res = post(res);
- }
}
return res[0];
}