X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=lambda_evaluator.mdwn;h=93870a559a704c9fa221c0951427775416076d17;hp=8c3e6d504dd87fc0887f740c2f6260ed022ea12f;hb=3de7188739d607c5430e6180497f7c9866bbcd2c;hpb=c5d5e93f0c0aedb6c149f06870792c7d219a5081
diff --git a/lambda_evaluator.mdwn b/lambda_evaluator.mdwn
index 8c3e6d50..93870a55 100644
--- a/lambda_evaluator.mdwn
+++ b/lambda_evaluator.mdwn
@@ -22,7 +22,7 @@ Blank lines are fine.
*Abbreviations*: In an earlier version, you couldn't use abbreviations. `\x y. y x x` had to be written `(\x (\y ((y x) x)))`. We've upgraded the parser though, so now it should be able to understand any lambda term that you can.
-*Constants*: (NOT YET IMPLEMENTED!) The combinators `S`, `K`, `I`, `C`, `B`, `W`, and `T` are pre-defined to their standard values. Also, integers will automatically be converted to Church numerals. (`0` is `\s z. z`, `1` is `\s z. s z`, and so on.)
+*Constants*: The combinators `S`, `K`, `I`, `C`, `B`, `W`, and `T` are pre-defined to their standard values. Also, integers will automatically be converted to Church numerals. (`0` is `\s z. z`, `1` is `\s z. s z`, and so on.)
@@ -38,6 +38,7 @@ let and = \l r. l r false in
)
+do eta-reductions too
@@ -78,15 +79,16 @@ Object.prototype.error = function (message, t) {
var parse = make_parse();
function go(source) {
- var string, tree, expr;
+ var string, tree, expr, eta;
try {
tree = parse(source);
// string = JSON.stringify(tree, ['key', 'name', 'message', 'value', 'arity', 'first', 'second', 'third', 'fourth'], 4);
- // string = JSON.stringify(tree.handler(), ['key', 'name', 'message', 'value', 'arity', 'first', 'second', 'tag', 'variable', 'left', 'right', 'bound', 'body' ], 4);
expr = tree.handler();
- string = expr.to_string() + "\n\n~~>\n\n";
- // string = '';
- // string = string + reduce(expr, false, false).to_string();
+ // string = JSON.stringify(expr, ['key', 'name', 'message', 'value', 'arity', 'first', 'second', 'tag', 'variable', 'left', 'right', 'bound', 'body' ], 4);
+// string = expr.to_string() + "\n\n~~>\n\n";
+ string = '';
+ eta = document.getElementById('ETA').checked;
+ string = string + reduce(expr, eta, false).to_string();
} catch (e) {
string = JSON.stringify(e, ['name', 'message', 'from', 'to', 'key',
'value', 'arity', 'first', 'second', 'third', 'fourth'], 4);