X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=code%2Fparse.js;h=5cdeb40e6210d126593905eb725d22fc0b15ddac;hp=72fda3e67f6bd2c7ef26c162b2b0854d0dac2a9a;hb=c51397c5a41cbf75e37382905b212868e427b16b;hpb=af5b07b20b0791bc0f386f71f98475c9d7c9e4e0 diff --git a/code/parse.js b/code/parse.js index 72fda3e6..5cdeb40e 100644 --- a/code/parse.js +++ b/code/parse.js @@ -140,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() { @@ -208,8 +211,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(); @@ -233,9 +244,11 @@ var make_parse = function () { return t; } else { t.first = []; - while (token.arity === "name") { + while (token.arity === "name" || token.id === "\\") { + if (token.id !== "\\") { t.first.push(n); n = token; + } advance(); } if (token.arity === "literal" && t.first.length === 0) {