X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=code%2Fparse.js;h=9712809b40c5d7d608b48543eb4c5270cc4e6712;hp=6882d79f6d7a170a9dc5b71d74767a7dccd3f334;hb=f444e1009ca1e0a55bc058d05955fbe3dd39bcea;hpb=fee1f7831003a7edee103dd7999b390abc7583c8

diff --git a/code/parse.js b/code/parse.js
index 6882d79f..9712809b 100644
--- a/code/parse.js
+++ b/code/parse.js
@@ -4,6 +4,9 @@
 //      http://javascript.crockford.com/tdop/index.html
 //      Douglas Crockford 2010-06-26
 
+//      See also http://effbot.org/zone/simple-top-down-parsing.htm
+
+
 /*jslint onevar: false
  */
 
@@ -65,6 +68,7 @@ var make_parse = function () {
         }
     };
 
+	/*
 	try {
 		if (console && console.debug) {
 			function print() {
@@ -72,6 +76,7 @@ var make_parse = function () {
 			}
 		}
 	} catch (e) {}
+	*/
 
     var symbol = function (id) {
         var s = symbol_table[id];
@@ -135,6 +140,9 @@ var make_parse = function () {
     symbol("(");
     symbol("\\").handler = lambda_handler;
     symbol("lambda").handler = lambda_handler;
+    symbol("\u03bb").handler = lambda_handler;
+    // symbol("\u2203").handler = exists_handler;
+    // symbol("\u2200").handler = forall_handler;
     symbol(".");
 
 	function make_constants() {
@@ -203,8 +211,18 @@ var make_parse = function () {
 		constant("I", make_lam(x, xx));
 		constant("B", make_lam3(u, v, x, make_app(uu, make_app(vv, xx))));
 		constant("C", make_lam3(u, v, x, make_app3(uu, xx, vv)));
-		constant("W", make_lam2(u, v, make_app3(uu, vv, vv)));
+
+		// trush \uv.vu = CI = box
 		constant("T", make_lam2(u, v, make_app(vv, uu)));
+		// vireo \uvw.wuv = pair
+		constant("V", make_lam3(u, v, x, make_app3(xx, uu, vv)));
+		// warbler \uv.uvv = C(BM(BBT) = C(BS(C(BBI)I))I
+		constant("W", make_lam2(u, v, make_app3(uu, vv, vv)));
+		// mockingbird \u.uu = SII = omega
+		constant("M", make_lam(u, make_app(uu, uu)));
+		// lark \uv.u(vv) = CBM = BWB
+		constant("L", make_lam2(u, v, make_app(uu, make_app(vv, vv))));
+		// Y is SLL
 
 	}
 	make_constants();
@@ -228,9 +246,11 @@ var make_parse = function () {
                 return t;
             } else {
                 t.first = [];
-                while (token.arity === "name") {
-                    t.first.push(n);
-                    n = token;
+                while (token.arity === "name" || token.id === "\\") {
+		    if (token.id !== "\\") {
+                      t.first.push(n);
+                      n = token;
+		    }
                     advance();
                 }
 				if (token.arity === "literal" && t.first.length === 0) {
@@ -288,7 +308,7 @@ var make_parse = function () {
         tokens = source.tokens();
         token_nr = 0;
         advance();
-        
+
         // let n = c in b
         // (\n. b) c
 
@@ -318,7 +338,7 @@ var make_parse = function () {
             target = t;
             advance("in");
         }
-    
+
         target.second = expression(false);
 
         advance("(end)");