@graffiticode/basis 1.5.7 → 1.5.9

package/package.json

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

package/src/compiler.js

@@ -35,9 +35,10 @@ class Visitor {
       }
       // console.log(
       //   "Visitor/visit()",
+      //   "nodePool=" + JSON.stringify(this.nodePool, null, 2),
       //   "node.tag=" + node.tag,
       // );
-      const fn = (this[node.tag] || this["CATCH_ALL"]).bind(this);
+      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(fn, "2000: Visitor function not defined for: " + node.tag);
       assert(typeof resume === "function", message(1003));
@@ -48,6 +49,10 @@ class Visitor {
         fn(node, options, resume);
       }
     } catch (x) {
+      console.log(
+        "Vistor/visit()",
+        "ERROR: " + x
+      );
       resume(error(x.stack));
     }
   }
@@ -277,6 +282,11 @@ export class Checker extends Visitor {
     const val = node;
     resume(err, val);
   }
+  IF(node, options, resume) {
+    const err = [];
+    const val = node;
+    resume(err, val);
+  }
   OF(node, options, resume) {
     const err = [];
     const val = node;
@@ -364,6 +374,11 @@ export class Transformer extends Visitor {
     return nid;
   }
   match(options, patterns, node) {
+    // console.log(
+    //   "match()",
+    //   "patterns=" + JSON.stringify(patterns, null, 2),
+    //   "node=" + JSON.stringify(node, null, 2),
+    // );
     if (patterns.size === 0 || node === undefined) {
       return false;
     }
@@ -680,9 +695,14 @@ export class Transformer extends Visitor {
   CASE(node, options, resume) {
     // FIXME this isn't ASYNC compatible
     options.SYNC = true;
-    this.visit(node.elts[0], options, (err, e0) => {
+    this.visit(node.elts[0], options, (e0, v0) => {
       const e0Node = this.node(node.elts[0]);
-      const expr = (e0Node.tag === 'NUM' || e0Node.tag === 'NUM') && e0Node || {tag: 'STR', elts: [`${e0}`]};
+      const expr = (
+        e0Node.tag === 'NUM' ||
+          e0Node.tag === 'NUM'
+      ) && e0Node || {
+        tag: 'STR', elts: [`${v0}`]
+      };
       let foundMatch = false;
       const patterns = [];
       for (var i = 1; i < node.elts.length; i++) {
@@ -710,6 +730,29 @@ export class Transformer extends Visitor {
       });
     });
   }
+  IF(node, options, resume) {
+    this.visit(node.elts[0], options, (e0, v0) => {
+      if (!!v0) {
+        this.visit(node.elts[1], options, (e1, v1) => {
+          const err = [
+            ...e0,
+            ...e1,
+          ];
+          const val = v1;
+          resume(err, val);
+        });
+      } else {
+        this.visit(node.elts[2], options, (e2, v2) => {
+          const err = [
+            ...e0,
+            ...e2,
+          ];
+          const val = v2;
+          resume(err, val);
+        });
+      }
+    });
+  }
 }
 
 export class Renderer {