projects
/
lambda.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lambda.js: tweak
[lambda.git]
/
code
/
lambda.js
diff --git
a/code/lambda.js
b/code/lambda.js
index
609cce0
..
132d9e9
100644
(file)
--- a/
code/lambda.js
+++ b/
code/lambda.js
@@
-207,11
+207,14
@@
function Lambda_var(variable) {
var res = left, x;
while (stack.length) {
x = stack.shift();
var res = left, x;
while (stack.length) {
x = stack.shift();
- res = new Lambda_app(res, x.eval_loop([], eta));
+ // res = new Lambda_app(res, x.eval_loop([], eta));
+ res = new Lambda_app(res, reduce(x, eta, false));
}
return res;
}
}
return res;
}
- return unwind(this, stack);
+ // return unwind(this, stack);
+ // trampoline to, args
+ return [null, unwind(this, stack)];
};
this.eval_cbv = function (aggressive) {
return this;
};
this.eval_cbv = function (aggressive) {
return this;
@@
-261,7
+264,9
@@
function Lambda_app(left, right) {
this.eval_loop = function (stack, eta) {
var new_stack = stack.slice(0);
new_stack.unshift(this.right);
this.eval_loop = function (stack, eta) {
var new_stack = stack.slice(0);
new_stack.unshift(this.right);
- return this.left.eval_loop(new_stack, eta);
+ // return this.left.eval_loop(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_cbv = function (aggressive) {
var left = this.left.eval_cbv(aggressive);
@@
-355,16
+360,19
@@
function Lambda_lam(variable, body) {
};
this.eval_loop = function (stack, eta) {
if (stack.length === 0) {
};
this.eval_loop = function (stack, eta) {
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;
- }
+ // 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();
+ } else {
+ return term;
+ }
} else {
var x = stack[0];
var xs = stack.slice(1);
} else {
var x = stack[0];
var xs = stack.slice(1);
- return subst(this.bound, x, this.body).eval_loop(xs, eta);
+ // return subst(this.bound, x, this.body).eval_loop(xs, eta);
+ // trampoline to, args
+ return [subst(this.bound, x, this.body), xs, eta];
}
};
this.eval_cbv = function (aggressive) {
}
};
this.eval_cbv = function (aggressive) {
@@
-414,7
+422,13
@@
function reduce(expr, eta, cbv) {
if (cbv) {
return expr.eval_cbv(cbv > 1);
} else {
if (cbv) {
return expr.eval_cbv(cbv > 1);
} else {
- return expr.eval_loop([], eta);
+ // return expr.eval_loop([], eta);
+ var to_eval = expr, res = [[], eta];
+ while (to_eval !== null) {
+ res = to_eval.eval_loop.apply(to_eval, res);
+ to_eval = res.shift();
+ }
+ return res[0];
}
}
}
}