X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=lambda_evaluator.mdwn;h=c9e21644124be4c830b25d8c136b62e1138878e0;hp=3fba8fadf354258c694900734a4fd00dbc0ebdab;hb=fc7709accbbf8b3ea0d8fc463205fa372a437edd;hpb=9a92978d1e62e3abd8e23b5b243d04d429dfaba5 diff --git a/lambda_evaluator.mdwn b/lambda_evaluator.mdwn index 3fba8fad..c9e21644 100644 --- a/lambda_evaluator.mdwn +++ b/lambda_evaluator.mdwn @@ -1,6 +1,3 @@ -Lambda Evaluator ----------------- - This lambda evaluator will allow you to write lambda terms and evaluate (that is, normalize) them, and inspect the results. (This won't work in Racket, because Racket doesn't even try to represent the internal structure of a function in a human-readable way.) @@ -22,7 +19,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*: 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`, `T`, `M` (aka ω) and `L` 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.) @@ -79,7 +76,7 @@ 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); @@ -87,7 +84,8 @@ Object.prototype.error = function (message, t) { // 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 = ''; - string = string + reduce(expr, document.getElementById('ETA').value, false).to_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);