tweak lambda evaluator

[lambda.git] / code / parse.js

diff --git a/code/parse.js b/code/parse.js
index 2e0745b..2718218 100644 (file)
--- a/code/parse.js
+++ b/code/parse.js
@@ -34,10 +34,10 @@ var make_parse = function () {
         a = t.type;
         if (a === "name") {
             o = symbol_table[v];
-            if (o && typeof o !== 'function') {
-                a = "keyword";
-            } else {
+            if (!o || typeof o === 'function') {
                 o = symbol_table["(name)"];
+            } else {
+                a = o.arity || "keyword";
             }
         } else if (a ===  "number") {
             o = symbol_table["(literal)"];
@@ -65,6 +65,14 @@ var make_parse = function () {
         }
     };
 
+       try {
+               if (console && console.debug) {
+                       function print() {
+                               console.debug.apply(this, arguments);
+                       }
+               }
+       } catch (e) {}
+
     var symbol = function (id) {
         var s = symbol_table[id];
         if (!s) {
@@ -75,14 +83,6 @@ var make_parse = function () {
         return s;
     };
 
-//     try {
-//         if (console && console.debug) {
-//             function print() {
-//                 console.debug.apply(this, arguments);
-//             }
-//         }
-//     } catch (e) {}
-
     var var_table;
     var name_table;
 
@@ -149,10 +149,10 @@ var make_parse = function () {
                        var x = symbol(s);
                        x.handler = function () {
                                this.value = symbol_table[this.id].value;
-                               this.arity = "literal";
                                return this;
                        };
                        x.value = v;
+                       x.arity = "literal";
                        return x;
                };
 
@@ -212,7 +212,11 @@ var make_parse = function () {
                     n = token;
                     advance();
                 }
-                if (token.id === ".") {
+                               if (token.arity === "literal" && t.first.length === 0) {
+                                       t.first.push(n);
+                                       t.second = token;
+                                       advance();
+                               } else if (token.id === ".") {
                     t.first.push(n);
                     advance();
                     t.second = expression(in_let);
@@ -248,8 +252,8 @@ var make_parse = function () {
                     n = token;
                     advance(")");
                 } else {
-                    if (token.arity !== "name") {
-                        token.error("Expected a variable name.");
+                    if (token.arity !== "name" && token.arity !== "literal") {
+                        token.error("Expected a variable name or literal.");
                     }
                     token.first = n;
                     n = token;