projects / lambda.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 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>
code/lambda.js patch | blob | history
lambda-let.html patch | blob | history
szabolcsi-reflexive.png [deleted file] patch | blob | history

diff --git a/code/lambda.js b/code/lambda.js
index 4b684f4..c28a0c1 100644 (file)
--- a/code/lambda.js
+++ b/code/lambda.js
@@ -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");
@@ -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 --git a/lambda-let.html b/lambda-let.html
index 307c408..fd8dece 100644 (file)
--- a/lambda-let.html
+++ b/lambda-let.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Lambda tutorial</title>
+<title>Lambda evaluator with lets</title>
 <script language=JavaScript src="code/lambda.js"></script>
 </head>
 <body>
diff --git a/szabolcsi-reflexive.png b/szabolcsi-reflexive.png
deleted file mode 100644 (file)
index 8b52408..0000000
Binary files a/szabolcsi-reflexive.png and /dev/null differ
NYU Lambda Wiki v2