@graffiticode/basis 1.5.9 → 1.5.11

package/package.json

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

package/src/compiler.js

@@ -170,12 +170,30 @@ export class Checker extends Visitor {
   ADD(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]));
-        }
-        if (isNaN(+val2)) {
-          err2 = err2.concat(error("Argument must be a number.", node.elts[1]));
-        }
+        const err = [].concat(err1).concat(err2);
+        const val = node;
+        resume(err, val);
+      });
+    });
+  }
+  SUB(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) => {
+        // if (isNaN(+val1)) {
+        //   err1 = err1.concat(error("Argument must be a number.", node.elts[0]));
+        // }
+        // if (isNaN(+val2)) {
+        //   err2 = err2.concat(error("Argument must be a number.", node.elts[1]));
+        // }
         const err = [].concat(err1).concat(err2);
         const val = node;
         resume(err, val);
@@ -205,12 +223,6 @@ export class Checker 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("Argument must be a number.", node.elts[0]));
-        }
-        if (isNaN(+val2)) {
-          err2 = err2.concat(error("Argument must be a number.", node.elts[1]));
-        }
         const err = [].concat(err1).concat(err2);
         const val = node;
         resume(err, val);
@@ -220,12 +232,6 @@ export class Checker extends Visitor {
   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]));
-        }
-        if (isNaN(+val2)) {
-          err2 = err2.concat(error("Argument must be a number.", node.elts[1]));
-        }
         const err = [].concat(err1).concat(err2);
         const val = node;
         resume(err, val);
@@ -272,6 +278,11 @@ export class Checker extends Visitor {
     const val = node;
     resume(err, val);
   }
+  REDUCE(node, options, resume) {
+    const err = [];
+    const val = node;
+    resume(err, val);
+  }
   STYLE(node, options, resume) {
     const err = [];
     const val = node;
@@ -292,6 +303,11 @@ export class Checker extends Visitor {
     const val = node;
     resume(err, val);
   }
+  PRINT(node, options, resume) {
+    const err = [];
+    const val = node;
+    resume(err, val);
+  }
 }
 
 function enterEnv(ctx, name, paramc) {
@@ -466,7 +482,7 @@ export class Transformer extends Visitor {
       enterEnv(options, "lambda", params.length);
       params.forEach((param, i) => {
         // let inits = this.nodePool[node.elts[3]].elts;
-        if (args[i]) {
+        if (args[i] !== undefined) {
           // Got an arg so use it.
           addWord(options, param, {
             name: param,
@@ -514,7 +530,7 @@ export class Transformer extends Visitor {
   IDENT(node, options, resume) {
     let word = findWord(options, node.elts[0]);
     const err = [];
-    const val = word && word.val || node.elts[0];
+    const val = word?.val !== undefined ? word.val : node.elts[0];
     resume(err, val);
   }
   STR(node, options, resume) {
@@ -545,6 +561,24 @@ export class Transformer extends Visitor {
       });
     });
   }
+  SUB(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);
+        const val = +v0 - +v1;
+        resume(err, val);
+      });
+    });
+  }
+  LT(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);
+        const val = +v0 < +v1;
+        resume(err, val);
+      });
+    });
+  }
   BOOL(node, options, resume) {
     const err = [];
     const val = node.elts[0];
@@ -590,10 +624,10 @@ export class Transformer extends Visitor {
     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]));
+          err1 = err1.concat(error("MUL first argument must be a number: ", JSON.stringify(node, null, 2)));
         }
         if (isNaN(+val2)) {
-          err2 = err2.concat(error("Argument must be a number.", node.elts[1]));
+          err2 = err2.concat(error("MUL second argument must be a number: ", JSON.stringify(node, null, 2)));
         }
         const err = [].concat(err1).concat(err2);
         const val = +val1 * +val2;
@@ -663,7 +697,6 @@ export class Transformer extends Visitor {
     this.visit(node.elts[1], options, (e1, v1) => {
       options.args = v1;
       this.visit(node.elts[0], options, (e0, v0) => {
-        //exitEnv(options);
         const err = [].concat(e1).concat(e0);
         const val = v0;
         resume(err, val);
@@ -671,6 +704,8 @@ export class Transformer extends Visitor {
     });
   }
   MAP(node, options, resume) {
+    // FIXME make async
+    options.SYNC = true;
     this.visit(node.elts[1], options, (e1, v1) => {
       let err = [];
       let val = [];
@@ -686,6 +721,55 @@ export class Transformer extends Visitor {
         });
       });
     });
+    options.SYNC = false;
+  }
+  FILTER(node, options, resume) {
+    // FIXME make async
+    options.SYNC = true;
+    this.visit(node.elts[1], options, (e1, v1) => {
+      let err = [];
+      let val = [];
+      v1.forEach(args => {
+        options.args = args;
+        options = JSON.parse(JSON.stringify(options));  // Copy option arg support async.
+        this.visit(node.elts[0], options, (e0, v0) => {
+          if (!!v0) {
+            val.push(args);
+          } else {
+            val.push(null);
+          }
+          err = err.concat(e0);
+          if (val.length === v1.length) {
+            val = val.filter(v => v !== null);
+            resume(err, val);
+          }
+        });
+      });
+    });
+    options.SYNC = false;
+  }
+  REDUCE(node, options, resume) {
+    // FIXME make async
+    // reduce (fn) acc list
+    options.SYNC = true;
+    this.visit(node.elts[1], options, (e1, v1) => {
+      this.visit(node.elts[2], options, (e2, v2) => {
+        let err = [];
+        let val = v1;
+        v2.forEach((args, index) => {
+          options.args = [val, args];
+          options = JSON.parse(JSON.stringify(options));  // Copy option arg support async.
+          this.visit(node.elts[0], options, (e0, v0) => {
+            val = v0;
+            err = err.concat(e0);
+            if (index === v2.length - 1) {
+              resume(err, val);
+            }
+          });
+        });
+      });
+    });
+    options.SYNC = false;
   }
   STYLE(node, options, resume) {
     const err = [];
@@ -698,7 +782,7 @@ export class Transformer extends Visitor {
     this.visit(node.elts[0], options, (e0, v0) => {
       const e0Node = this.node(node.elts[0]);
       const expr = (
-        e0Node.tag === 'NUM' ||
+        e0Node.tag === 'BOOL' ||
           e0Node.tag === 'NUM'
       ) && e0Node || {
         tag: 'STR', elts: [`${v0}`]
@@ -753,6 +837,37 @@ export class Transformer extends Visitor {
       }
     });
   }
+  GET(node, options, resume) {
+    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 v1 === "string", "Type Error: expected v1 to be a string.");
+        const val = v0[v1];
+        resume(err, val);
+      });
+    });
+  }
+  NTH(node, options, resume) {
+    this.visit(node.elts[0], options, (e0, v0) => {
+      this.visit(node.elts[1], options, (e1, v1) => {
+        const err = [...e0, ...e1];
+        assert(typeof v0 === "number", "Type Error: expected v0 to be a number. Got " + (typeof v0));
+        assert(typeof v1 === "object", "Type Error: expected v1 to be an object. Got " + (typeof v1));
+        const val = v1[v0];
+        resume(err, val);
+      });
+    });
+  }
+  PRINT(node, options, resume) {
+    this.visit(node.elts[0], options, (e0, v0) => {
+      const err = e0;
+      const val = {
+        print: v0,
+      };
+      resume(err, val);
+    })
+  }
 }
 
 export class Renderer {