X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=lambda_evaluator.mdwn;h=2c6086bf3502cc7f67e452b8c9473d30fcb3c60a;hp=1ca957b4a84d8f266421019bc3ee096fed72e325;hb=6f288f5b1aaa1d42e7f98682e74143fc66e1b53c;hpb=518a11274337da8ebfcd2d5ea2fe9f302a424ea9;ds=sidebyside

diff --git a/lambda_evaluator.mdwn b/lambda_evaluator.mdwn
index 1ca957b4..2c6086bf 100644
--- a/lambda_evaluator.mdwn
+++ b/lambda_evaluator.mdwn
@@ -39,10 +39,10 @@ let and = \l r. l r false in
 </textarea>
 <input id="PARSE" value="Normalize" type="button">
 <noscript><p>You may not see it because you have JavaScript turned off. Uffff!</p></noscript>
-<script language=JavaScript src="code/tokens.js"></script>
-<script language=JavaScript src="code/parse.js"></script>
-<script language=JavaScript src="code/lambda.js"></script>
-<script language=JavaScript src="code/json2.js"></script>
+<script src="/code/lambda.js"></script>
+<script src="/code/tokens.js"></script>
+<script src="/code/parse.js"></script>
+<script src="/code/json2.js"></script>
 <pre id="OUTPUT">
 </pre>
 <script>
@@ -78,12 +78,15 @@ Object.prototype.error = function (message, t) {
     var parse = make_parse();
 
     function go(source) {
-        var string, tree;
+        var string, tree, expr;
         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);
-			string = tree.handler().to_string();
+ //           string = JSON.stringify(tree, ['key', 'name', 'message', 'value', 'arity', 'first', 'second', 'third', 'fourth'], 4);
+			expr = tree.handler();
+            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, false, false).to_string();
         } catch (e) {
             string = JSON.stringify(e, ['name', 'message', 'from', 'to', 'key',
                     'value', 'arity', 'first', 'second', 'third', 'fourth'], 4);
@@ -119,5 +122,4 @@ The code is based on:
 
 Improvements we hope to add soon: the ability to reduce Combinatory Logic combinators and report the result as combinators, rather than in lambda forms.
 
-For these assignments, you'll probably want to use a "lambda calculator" to check your work. This accepts any grammatical lambda expression and reduces it to normal form, when possible. See our [lambda-let page](/lambda-let.html),