@graffiticode/basis 1.5.12 → 1.5.14

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@graffiticode/basis",
   "type": "module",
-  "version": "1.5.12",
+  "version": "1.5.14",
   "description": "The basis library for creating Graffiticode languages",
   "main": "index.js",
   "scripts": {
@@ -26,5 +26,8 @@
     "https": "^1.0.0",
     "jest": "^27.0.1",
     "react": "^17.0.2"
+  },
+  "dependencies": {
+    "decimal.js": "^10.5.0"
   }
 }

package/src/compiler.js

@@ -1,5 +1,6 @@
 /* Copyright (c) 2021, ARTCOMPILER INC */
 import {assert, message, messages, reserveCodeRange} from "./share.js";
+import Decimal from 'decimal.js';
 reserveCodeRange(1000, 1999, "compile");
 messages[1001] = "Node ID %1 not found in pool.";
 messages[1002] = "Invalid tag in node with Node ID %1.";
@@ -185,6 +186,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) => {
@@ -308,6 +318,71 @@ 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) => {
+        this.visit(node.elts[2], options, (err3, val3) => {
+          const err = [].concat(err1).concat(err2).concat(err3);
+          const val = node;
+          resume(err, val);
+        });
+      });
+    });
+  }
+  EQ(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);
+      });
+    });
+  }
+  MOD(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);
+      });
+    });
+  }
 }
 
 function enterEnv(ctx, name, paramc) {
@@ -556,8 +631,12 @@ export class Transformer extends Visitor {
     this.visit(node.elts[0], options, (e0, v0) => {
       this.visit(node.elts[1], options, (e1, v1) => {
         const err = [].concat(e0).concat(e1);
-        const val = +v0 + +v1;
-        resume(err, val);
+        try {
+          const val = new Decimal(v0).plus(new Decimal(v1)).toNumber();
+          resume(err, val);
+        } catch (e) {
+          resume([...err, `Error in ADD operation: ${e.message}`], NaN);
+        }
       });
     });
   }
@@ -565,8 +644,12 @@ export class Transformer extends Visitor {
     this.visit(node.elts[0], options, (e0, v0) => {
       this.visit(node.elts[1], options, (e1, v1) => {
         const err = [].concat(e0).concat(e1);
-        const val = +v0 - +v1;
-        resume(err, val);
+        try {
+          const val = new Decimal(v0).minus(new Decimal(v1)).toNumber();
+          resume(err, val);
+        } catch (e) {
+          resume([...err, `Error in SUB operation: ${e.message}`], NaN);
+        }
       });
     });
   }
@@ -574,8 +657,12 @@ export class Transformer extends Visitor {
     this.visit(node.elts[0], options, (e0, v0) => {
       this.visit(node.elts[1], options, (e1, v1) => {
         const err = [].concat(e0).concat(e1);
-        const val = +v0 < +v1;
-        resume(err, val);
+        try {
+          const val = new Decimal(v0).lessThan(new Decimal(v1));
+          resume(err, val);
+        } catch (e) {
+          resume([...err, `Error in LT operation: ${e.message}`], false);
+        }
       });
     });
   }
@@ -623,30 +710,57 @@ export class Transformer extends Visitor {
   MUL(node, options, resume) {
     this.visit(node.elts[0], options, (err1, val1) => {
       this.visit(node.elts[1], options, (err2, val2) => {
-        if (isNaN(+val1)) {
-          err1 = err1.concat(error("MUL first argument must be a number: ", JSON.stringify(node, null, 2)));
-        }
-        if (isNaN(+val2)) {
-          err2 = err2.concat(error("MUL second argument must be a number: ", JSON.stringify(node, null, 2)));
+        let err = [].concat(err1).concat(err2);
+        try {
+          const val = new Decimal(val1).times(new Decimal(val2)).toNumber();
+          resume(err, val);
+        } catch (e) {
+          if (isNaN(+val1)) {
+            err = err.concat(error("MUL first argument must be a number: ", JSON.stringify(node, null, 2)));
+          }
+          if (isNaN(+val2)) {
+            err = err.concat(error("MUL second argument must be a number: ", JSON.stringify(node, null, 2)));
+          }
+          resume([...err, `Error in MUL operation: ${e.message}`], NaN);
         }
-        const err = [].concat(err1).concat(err2);
-        const val = +val1 * +val2;
-        resume(err, val);
       });
     });
   }
   POW(node, options, resume) {
     this.visit(node.elts[0], options, (err1, val1) => {
       this.visit(node.elts[1], options, (err2, val2) => {
-        if (isNaN(+val1)) {
-          err1 = err1.concat(error("Argument must be a number.", node.elts[0]));
+        let err = [].concat(err1).concat(err2);
+        try {
+          const val = new Decimal(val1).pow(new Decimal(val2)).toNumber();
+          resume(err, val);
+        } catch (e) {
+          if (isNaN(+val1)) {
+            err = err.concat(error("POW first argument must be a number: ", JSON.stringify(node, null, 2)));
+          }
+          if (isNaN(+val2)) {
+            err = err.concat(error("POW second argument must be a number: ", JSON.stringify(node, null, 2)));
+          }
+          resume([...err, `Error in POW operation: ${e.message}`], NaN);
         }
-        if (isNaN(+val2)) {
-          err2 = err2.concat(error("Argument must be a number.", node.elts[1]));
+      });
+    });
+  }
+  MOD(node, options, resume) {
+    this.visit(node.elts[0], options, (err1, val1) => {
+      this.visit(node.elts[1], options, (err2, val2) => {
+        let err = [].concat(err1).concat(err2);
+        try {
+          const val = new Decimal(val1).mod(new Decimal(val2)).toNumber();
+          resume(err, val);
+        } catch (e) {
+          if (isNaN(+val1)) {
+            err = err.concat(error("MOD first argument must be a number: ", JSON.stringify(node, null, 2)));
+          }
+          if (isNaN(+val2)) {
+            err = err.concat(error("MOD second argument must be a number: ", JSON.stringify(node, null, 2)));
+          }
+          resume([...err, `Error in MOD operation: ${e.message}`], NaN);
         }
-        const err = [].concat(err1).concat(err2);
-        const val = node;
-        resume(err, val);
       });
     });
   }
@@ -780,13 +894,19 @@ 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}`;
+      console.log(
+        "CASE",
+        "type=" + type,
+        "val=" + val,
+      );
       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++) {
@@ -841,7 +961,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);
@@ -884,6 +1004,109 @@ export class Transformer extends Visitor {
       resume(err, val);
     })
   }
+  EQ(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 EQ operation: ${e.message}`], false);
+        }
+      });
+    });
+  }
+  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) => {
+        this.visit(node.elts[2], options, (e2, v2) => {
+          const err = [].concat(e0).concat(e1).concat(e2);
+          try {
+            const start = new Decimal(v0);
+            const end = new Decimal(v1);
+            const step = new Decimal(v2);
+            
+            if (step.isZero()) {
+              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());
+                current = current.plus(step);
+              }
+            } else {
+              while (current.greaterThan(end)) {
+                result.push(current.toNumber());
+                current = current.plus(step);
+              }
+            }
+            
+            resume(err, result);
+          } catch (e) {
+            resume([...err, `Error in RANGE operation: ${e.message}`], []);
+          }
+        });
+      });
+    });
+  }
 }
 
 export class Renderer {