From: Jim Pryor Date: Mon, 20 Sep 2010 15:44:10 +0000 (-0400) Subject: fixed merge X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=ef0c9e389a02522583df53477f5a4622debc4a1b;hp=-c;ds=sidebyside fixed merge Signed-off-by: Jim Pryor --- ef0c9e389a02522583df53477f5a4622debc4a1b diff --combined code/lambda.js index c28a0c17,4b684f4e..c28a0c17 --- a/code/lambda.js +++ b/code/lambda.js @@@ -145,7 -145,6 +145,7 @@@ function stringToTree(input) input = input.replace(/in/g, " ) "); input = input.replace(/\(/g, " ( "); input = input.replace(/\)/g, " ) "); + input = input.replace(/;.*\n/g," "); input = input.replace(/\^/g, " ^ "); input = input.replace(/[\\]/g, " lambda "); input = input.replace(/\u03BB/g, "lambda"); @@@ -159,7 -158,6 +159,7 @@@ function formatTree(tree) output = output.replace(/[ \f\n\r\t\v]+$/, ""); output = output.replace(/[ \f\n\r\t\v]+\)/g, ")"); output = output.replace(/\)([^)(])/g, ") $1"); + output = output.replace(/lambda/g, "\\"); // output = output.replace(/lambda/g, "\u03BB"); // output = output.replace(/exists/g, "\u2203"); // output = output.replace(/forall/g, "\u2200"); diff --combined lambda-let.html index 8abd3501,307c408c..fd8deceb --- a/lambda-let.html +++ b/lambda-let.html @@@ -1,7 -1,7 +1,7 @@@ -Lambda tutorial +Lambda evaluator with lets - +