projects / lambda.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 5fe4a9a 6dc18a4)
fixed merge
authorJim Pryor <profjim@jimpryor.net>
Mon, 20 Sep 2010 15:44:10 +0000 (11:44 -0400)
committerJim Pryor <profjim@jimpryor.net>
Mon, 20 Sep 2010 15:44:10 +0000 (11:44 -0400)
Signed-off-by: Jim Pryor <profjim@jimpryor.net>
1  2 
code/lambda.js patch | diff1 | diff2 | blob | history
lambda-let.html patch | diff1 | diff2 | blob | history

diff --combined code/lambda.js
index c28a0c1,4b684f4..c28a0c1
--- 1/lambda.js
--- 2/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 8abd350,307c408..fd8dece
--- 1/lambda-let.html
--- 2/lambda-let.html
+++ b/lambda-let.html
@@@ -1,7 -1,7 +1,7 @@@
  <html>
  <head>
 -<title>Lambda tutorial</title>
 +<title>Lambda evaluator with lets</title>
- <script language=JavaScript src="lambda.js"></script>
+ <script language=JavaScript src="code/lambda.js"></script>
  </head>
  <body>
  
NYU Lambda Wiki v2