@graffiticode/basis 1.5.13 → 1.5.15

package/package.json

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

package/src/compiler.js

@@ -97,9 +97,24 @@ export class Checker extends Visitor {
       resume(err, data);
     });
   }
+  ERROR(node, options, resume) {
+    this.visit(node.elts[0], options, (e0, v0) => {
+      this.visit(node.elts[1], options, (e1, v1) => {
+        this.visit(node.elts[2], options, (e2, v2) => {
+          const err = [{
+            message: v0,
+            from: v1,
+            to: v2
+          }];
+          const val = node;
+          resume(err, val);
+        });
+      });
+    });
+  }
   PROG(node, options, resume) {
     this.visit(node.elts[0], options, (e0, v0) => {
-      const err = [];
+      const err = [].concat(e0);
       const val = node;
       resume(err, val);
     });
@@ -122,13 +137,15 @@ export class Checker extends Visitor {
   }
   NUM(node, options, resume) {
     const err = [];
-    const val = node;
+    const val = +node.elts[0];
     resume(err, val);
   }
   LAMBDA(node, options, resume) {
     const err = [];
     const val = node;
     this.visit(node.elts[0], options, (e0, v0) => {
+      const err = [].concat(e0);
+      const val = node;
       resume(err, val);
     });
   }
@@ -139,6 +156,8 @@ export class Checker extends Visitor {
       resume(err, val);
     } else {
       this.visit(node.elts[0], options, (e0, v0) => {
+        const err = [].concat(e0);
+        const val = node;
         resume(err, val);
       });
     }
@@ -150,7 +169,7 @@ export class Checker extends Visitor {
   }
   STR(node, options, resume) {
     const err = [];
-    const val = node;
+    const val = node.elts[0];
     resume(err, val);
   }
   JSON(node, options, resume) {
@@ -163,7 +182,7 @@ export class Checker extends Visitor {
   }
   CONCAT(node, options, resume) {
     this.visit(node.elts[0], options, (e0, v0) => {
-      const err = [];
+      const err = [].concat(e0);
       const val = node;
       resume(err, val);
     });
@@ -186,6 +205,15 @@ export class Checker extends Visitor {
       });
     });
   }
+  GET(node, options, resume) {
+    this.visit(node.elts[0], options, (err1, val1) => {
+      this.visit(node.elts[1], options, (err2, val2) => {
+        const err = [].concat(err1).concat(err2);
+        const val = node;
+        resume(err, val);
+      });
+    });
+  }
   LT(node, options, resume) {
     this.visit(node.elts[0], options, (err1, val1) => {
       this.visit(node.elts[1], options, (err2, val2) => {
@@ -309,6 +337,42 @@ export class Checker extends Visitor {
     const val = node;
     resume(err, val);
   }
+  GT(node, options, resume) {
+    this.visit(node.elts[0], options, (err1, val1) => {
+      this.visit(node.elts[1], options, (err2, val2) => {
+        const err = [].concat(err1).concat(err2);
+        const val = node;
+        resume(err, val);
+      });
+    });
+  }
+  GE(node, options, resume) {
+    this.visit(node.elts[0], options, (err1, val1) => {
+      this.visit(node.elts[1], options, (err2, val2) => {
+        const err = [].concat(err1).concat(err2);
+        const val = node;
+        resume(err, val);
+      });
+    });
+  }
+  LE(node, options, resume) {
+    this.visit(node.elts[0], options, (err1, val1) => {
+      this.visit(node.elts[1], options, (err2, val2) => {
+        const err = [].concat(err1).concat(err2);
+        const val = node;
+        resume(err, val);
+      });
+    });
+  }
+  NE(node, options, resume) {
+    this.visit(node.elts[0], options, (err1, val1) => {
+      this.visit(node.elts[1], options, (err2, val2) => {
+        const err = [].concat(err1).concat(err2);
+        const val = node;
+        resume(err, val);
+      });
+    });
+  }
   RANGE(node, options, resume) {
     this.visit(node.elts[0], options, (err1, val1) => {
       this.visit(node.elts[1], options, (err2, val2) => {
@@ -849,13 +913,14 @@ export class Transformer extends Visitor {
     // FIXME this isn't ASYNC compatible
     options.SYNC = true;
     this.visit(node.elts[0], options, (e0, v0) => {
-      const e0Node = this.node(node.elts[0]);
+      const type = typeof v0;
+      const val = `${v0}`;
       const expr = (
-        e0Node.tag === 'BOOL' ||
-          e0Node.tag === 'NUM'
-      ) && e0Node || {
-        tag: 'STR', elts: [`${v0}`]
-      };
+        val === null && {tag: "NUL", elts: []} ||
+        type === "boolean" && {tag: "BOOL", elts: [val]} ||
+        type === "number" && {tag: "NUM", elts: [val]} ||
+        {tag: "STR", elts: [val]}
+      );
       let foundMatch = false;
       const patterns = [];
       for (var i = 1; i < node.elts.length; i++) {
@@ -910,7 +975,7 @@ export class Transformer extends Visitor {
     this.visit(node.elts[0], options, (e0, v0) => {
       this.visit(node.elts[1], options, (e1, v1) => {
         const err = [...e0, ...e1];
-        assert(typeof v0 === "object", "Type Error: expected v0 to be an object.");
+        assert(typeof v0 === "object", "Type Error: expected v0 to be an object. Got " + JSON.stringify(v0));
         assert(typeof v1 === "string", "Type Error: expected v1 to be a string.");
         const val = v0[v1];
         resume(err, val);
@@ -966,6 +1031,58 @@ export class Transformer extends Visitor {
       });
     });
   }
+  GT(node, options, resume) {
+    this.visit(node.elts[0], options, (e0, v0) => {
+      this.visit(node.elts[1], options, (e1, v1) => {
+        const err = [].concat(e0).concat(e1);
+        try {
+          const val = new Decimal(v0).greaterThan(new Decimal(v1));
+          resume(err, val);
+        } catch (e) {
+          resume([...err, `Error in GT operation: ${e.message}`], false);
+        }
+      });
+    });
+  }
+  GE(node, options, resume) {
+    this.visit(node.elts[0], options, (e0, v0) => {
+      this.visit(node.elts[1], options, (e1, v1) => {
+        const err = [].concat(e0).concat(e1);
+        try {
+          const val = new Decimal(v0).greaterThanOrEqualTo(new Decimal(v1));
+          resume(err, val);
+        } catch (e) {
+          resume([...err, `Error in GE operation: ${e.message}`], false);
+        }
+      });
+    });
+  }
+  LE(node, options, resume) {
+    this.visit(node.elts[0], options, (e0, v0) => {
+      this.visit(node.elts[1], options, (e1, v1) => {
+        const err = [].concat(e0).concat(e1);
+        try {
+          const val = new Decimal(v0).lessThanOrEqualTo(new Decimal(v1));
+          resume(err, val);
+        } catch (e) {
+          resume([...err, `Error in LE operation: ${e.message}`], false);
+        }
+      });
+    });
+  }
+  NE(node, options, resume) {
+    this.visit(node.elts[0], options, (e0, v0) => {
+      this.visit(node.elts[1], options, (e1, v1) => {
+        const err = [].concat(e0).concat(e1);
+        try {
+          const val = !new Decimal(v0).equals(new Decimal(v1));
+          resume(err, val);
+        } catch (e) {
+          resume([...err, `Error in NE operation: ${e.message}`], false);
+        }
+      });
+    });
+  }
   RANGE(node, options, resume) {
     this.visit(node.elts[0], options, (e0, v0) => {
       this.visit(node.elts[1], options, (e1, v1) => {
@@ -980,10 +1097,8 @@ export class Transformer extends Visitor {
               resume([...err, 'Error in RANGE operation: step cannot be zero'], []);
               return;
             }
-            
             const result = [];
             let current = start;
-            
             if (step.isPositive()) {
               while (current.lessThan(end)) {
                 result.push(current.toNumber());
@@ -995,7 +1110,6 @@ export class Transformer extends Visitor {
                 current = current.plus(step);
               }
             }
-            
             resume(err, result);
           } catch (e) {
             resume([...err, `Error in RANGE operation: ${e.message}`], []);
@@ -1038,17 +1152,21 @@ export class Compiler {
       };
       const checker = new this.Checker(code);
       checker.check(options, (err, val) => {
-        const transformer = new this.Transformer(code);
-        transformer.transform(options, (err, val) => {
-          if (err && err.length) {
-            resume(err, val);
-          } else {
-            const renderer = new this.Renderer(val);
-            renderer.render(options, (err, val) => {
+        if (err.length > 0) {
+          resume(err);
+        } else {
+          const transformer = new this.Transformer(code);
+          transformer.transform(options, (err, val) => {
+            if (err && err.length) {
               resume(err, val);
-            });
-          }
-        });
+            } else {
+              const renderer = new this.Renderer(val);
+              renderer.render(options, (err, val) => {
+                resume(err, val);
+              });
+            }
+          });
+        }
       });
     } catch (x) {
       console.log("ERROR with code");