X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=code%2Fparse.js;h=08ac5f047377cf2ba9b9b9ee394a834866b49f80;hp=382ba029427d0335004c456b71137b2f9b711148;hb=3641a9827575d2eba30d316395eb3db7c45a1477;hpb=a3b99e629ce7473014b705dbb8ea9c4321639805

diff --git a/code/parse.js b/code/parse.js
index 382ba029..08ac5f04 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];
@@ -176,7 +181,11 @@ var make_parse = function () {
 				res = make_lam2(s, z, res);
 				number_table[this.value] = res;
 			}
-			return res;
+			if (this.first) {
+				return make_app(this.first.handler(), res);
+			} else {
+				return res;
+			}
 		}
 
 		var constant = function (s, v) {
@@ -199,8 +208,16 @@ 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
 		constant("T", make_lam2(u, v, make_app(vv, uu)));
+		// mockingbird \u.uu = SII
+		constant("M", make_lam(u, make_app(uu, uu)));
+		// warbler \uv.uvv = C(BM(BBT) = C(BS(C(BBI)I))I
+		constant("W", make_lam2(u, v, make_app3(uu, vv, vv)));
+		// lark \uv.u(vv) = CBM = BWB
+		constant("L", make_lam2(u, v, make_app(uu, make_app(vv, vv))));
+		// Y is SLL
 
 	}
 	make_constants();
@@ -224,9 +241,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) {