@graffiticode/basis 1.5.4 → 1.5.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@graffiticode/basis",
   "type": "module",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "description": "The basis library for creating Graffiticode languages",
   "main": "index.js",
   "scripts": {

package/src/compiler.js

@@ -33,14 +33,19 @@ class Visitor {
       } else {
         node = this.nodePool[nid];
       }
+      console.log(
+        "Visitor/visit()",
+        "node.tag=" + node.tag,
+      );
+      const fn = (this[node.tag] || this["CATCH_ALL"]).bind(this);
       assert(node && node.tag && node.elts, "2000: Visitor.visit() tag=" + node.tag + " elts= " + JSON.stringify(node.elts));
-      assert(this[node.tag], "2000: Visitor function not defined for: " + node.tag);
+      assert(fn, "2000: Visitor function not defined for: " + node.tag);
       assert(typeof resume === "function", message(1003));
       if (!options.SYNC && ASYNC) {
         // This is used to keep from blowing the call stack.
-        setTimeout(() => this[node.tag](node, options, resume), 0);
+        setTimeout(() => fn(node, options, resume), 0);
       } else {
-        this[node.tag](node, options, resume);
+        fn(node, options, resume);
       }
     } catch (x) {
       resume(error(x.stack));
@@ -366,7 +371,7 @@ export class Transformer extends Visitor {
       if (pattern.tag === undefined || node.tag === undefined) {
         return false;
       }
-      const patternNid = this.internPattern(pattern); 
+      const patternNid = this.internPattern(pattern);
       if (patternNid === this.internPattern(node) ||
           patternNid === this.internPattern(newNode('IDENT', ['_']))) {
         return true;
@@ -407,7 +412,6 @@ export class Transformer extends Visitor {
     return matches;
   }
 
-
   PROG(node, options, resume) {
     if (!options) {
       options = {};
@@ -485,7 +489,7 @@ export class Transformer extends Visitor {
             // elements, given that they may have been reordered due to the
             // nodes being visited asynchronously. The node ids are reversed,
             // so we need to add prepend the current v0 to the list.
-            const val = ndx.reduce((acc, v0) => [v0, ...acc], []);
+            const val = node.elts.reduce((acc, elt) => [...acc, ndx[elt]], []);
             resume(err, val);
           }
         });
@@ -560,7 +564,7 @@ export class Transformer extends Visitor {
             // This is a little trickery to restore the original order of the
             // fields, given that they may have been reordered due to the nodes
             // being visited asynchronously.
-            const val = ndx.reduce((acc, v0) => ({...acc, [v0.key]: v0.val}), {});
+            const val = node.elts.reduce((acc, elt) => ({...acc, [ndx[elt].key]: ndx[elt].val}), {});
             resume(err, val);
           }
         });