@graffiticode/parser 1.3.1 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graffiticode/parser",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "type": "module",
   "publishConfig": {
     "access": "public"

package/src/ast.js

@@ -496,86 +496,40 @@ export class Ast {
     Ast.number(ctx, -1 * v1);
   }
 
-  static add(ctx, coord) {
-    const n2 = Ast.node(ctx, Ast.pop(ctx));
-    const n1 = Ast.node(ctx, Ast.pop(ctx));
-    const v2 = n2.elts[0];
-    const v1 = n1.elts[0];
-    if (n1.tag !== "NUM" || n2.tag !== "NUM") {
-      Ast.push(ctx, {
-        tag: "ADD",
-        elts: [n1, n2],
-        coord
-      });
-    } else {
-      Ast.number(ctx, +v1 + +v2);
-    }
+  static add(ctx) {
+    const n2 = Ast.pop(ctx);
+    const n1 = Ast.pop(ctx);
+    Ast.push(ctx, { tag: "ADD", elts: [n1, n2] });
   }
 
   static sub(ctx) {
-    const n2 = Ast.node(ctx, Ast.pop(ctx));
-    const n1 = Ast.node(ctx, Ast.pop(ctx));
-    const v2 = n2.elts[0];
-    const v1 = n1.elts[0];
-    if (n1.tag !== "NUM" || n2.tag !== "NUM") {
-      Ast.push(ctx, { tag: "SUB", elts: [n1, n2] });
-    } else {
-      Ast.number(ctx, +v1 - +v2);
-    }
+    const n2 = Ast.pop(ctx);
+    const n1 = Ast.pop(ctx);
+    Ast.push(ctx, { tag: "SUB", elts: [n1, n2] });
   }
 
-  // static mul(ctx) {
-  //   let n2 = Ast.node(ctx, Ast.pop(ctx));
-  //   let n1 = Ast.node(ctx, Ast.pop(ctx));
-  //   const v2 = n2.elts[0];
-  //   const v1 = n1.elts[0];
-  //   if (n1.tag === undefined) {
-  //     n1 = n1.elts[0];
-  //   }
-  //   if (n2.tag === undefined) {
-  //     n2 = n2.elts[0];
-  //   }
-  //   if (n1.tag !== "NUM" || n2.tag !== "NUM") {
-  //     Ast.push(ctx, { tag: "MUL", elts: [n2, n1] });
-  //   } else {
-  //     Ast.number(ctx, +v1 * +v2);
-  //   }
-  // }
+  static mul(ctx) {
+    const n2 = Ast.pop(ctx);
+    const n1 = Ast.pop(ctx);
+    Ast.push(ctx, { tag: "MUL", elts: [n1, n2] });
+  }
 
   static div(ctx) {
-    const n2 = Ast.node(ctx, Ast.pop(ctx));
-    const n1 = Ast.node(ctx, Ast.pop(ctx));
-    const v2 = n2.elts[0];
-    const v1 = n1.elts[0];
-    if (n1.tag !== "NUM" || n2.tag !== "NUM") {
-      Ast.push(ctx, { tag: "DIV", elts: [n1, n2] });
-    } else {
-      Ast.number(ctx, +v1 / +v2);
-    }
+    const n2 = Ast.pop(ctx);
+    const n1 = Ast.pop(ctx);
+    Ast.push(ctx, { tag: "DIV", elts: [n1, n2] });
   }
 
   static mod(ctx) {
-    const n2 = Ast.node(ctx, Ast.pop(ctx));
-    const n1 = Ast.node(ctx, Ast.pop(ctx));
-    const v1 = n1.elts[0];
-    const v2 = n2.elts[0];
-    if (n1.tag !== "NUM" || n2.tag !== "NUM") {
-      Ast.push(ctx, { tag: "MOD", elts: [n1, n2] });
-    } else {
-      Ast.number(ctx, +v1 % +v2);
-    }
+    const n2 = Ast.pop(ctx);
+    const n1 = Ast.pop(ctx);
+    Ast.push(ctx, { tag: "MOD", elts: [n1, n2] });
   }
 
   static pow(ctx) {
-    const n2 = Ast.node(ctx, Ast.pop(ctx));
-    const n1 = Ast.node(ctx, Ast.pop(ctx));
-    const v2 = n2.elts[0];
-    const v1 = n1.elts[0];
-    if (n1.tag !== "NUM" || n2.tag !== "NUM") {
-      Ast.push(ctx, { tag: "POW", elts: [n1, n2] });
-    } else {
-      Ast.number(ctx, Math.pow(+v1, +v2));
-    }
+    const n2 = Ast.pop(ctx);
+    const n1 = Ast.pop(ctx);
+    Ast.push(ctx, { tag: "POW", elts: [n1, n2] });
   }
 
   static concat(ctx) {

package/src/folder.js

@@ -25,9 +25,9 @@ export class Folder {
       PARENS: Folder.unaryExpr,
       APPLY: Folder.apply,
       LAMBDA: Folder.lambda,
-      // "MUL": mul,
-      // "DIV": div,
-      // "SUB": sub,
+      MUL: Folder.mul,
+      DIV: Folder.div,
+      SUB: Folder.sub,
       TAG: Folder.tag,
       ADD: Folder.add,
       POW: Folder.pow,
@@ -161,6 +161,24 @@ export class Folder {
     Ast.add(Folder.#ctx);
   }
 
+  static sub(node) {
+    Folder.#visit(node.elts[0]);
+    Folder.#visit(node.elts[1]);
+    Ast.sub(Folder.#ctx);
+  }
+
+  static mul(node) {
+    Folder.#visit(node.elts[0]);
+    Folder.#visit(node.elts[1]);
+    Ast.mul(Folder.#ctx);
+  }
+
+  static div(node) {
+    Folder.#visit(node.elts[0]);
+    Folder.#visit(node.elts[1]);
+    Ast.div(Folder.#ctx);
+  }
+
   static pow(node) {
     Folder.#visit(node.elts[0]);
     Folder.#visit(node.elts[1]);

package/src/folder.spec.js

@@ -2,7 +2,7 @@ import { Folder } from "./folder.js";
 import { Ast } from "./ast.js";
 
 describe("folder", () => {
-  it("should fold 'add 2 3' to 5", () => {
+  it("should pass 'add 2 3' through as ADD node", () => {
     // Arrange
     const ctx = {
       state: {
@@ -35,8 +35,15 @@ describe("folder", () => {
     const resultId = ctx.state.nodeStack.pop();
     const resultNode = ctx.state.nodePool[resultId];
 
-    // Assert
-    expect(resultNode.tag).toBe("NUM");
-    expect(resultNode.elts[0]).toBe("5");
+    // Assert - arithmetic is deferred to compiler, not folded
+    expect(resultNode.tag).toBe("ADD");
+    expect(resultNode.elts.length).toBe(2);
+    // elts are nids (intern recursively interns object elts)
+    const n1 = Ast.node(ctx, resultNode.elts[0]);
+    const n2 = Ast.node(ctx, resultNode.elts[1]);
+    expect(n1.tag).toBe("NUM");
+    expect(n1.elts[0]).toBe("2");
+    expect(n2.tag).toBe("NUM");
+    expect(n2.elts[0]).toBe("3");
   });
 });

package/src/parser.spec.js

@@ -370,47 +370,36 @@ describe("parser integration tests", () => {
     expect(errorNode.tag).toBe("ERROR");
   });
 
-  it("should perform parse-time evaluation for adding two numbers", async () => {
-    // Use basis lexicon which includes add function
-    // Act - parse a simple addition expression
+  it("should parse 'add 123 456' as ADD node with operands", async () => {
+    // Arithmetic is deferred to the compiler, not folded at parse time
     const result = await parser.parse(0, "add 123 456..", basisLexicon);
-    console.log(
-      "TEST",
-      "result=" + JSON.stringify(result, null, 2),
-    );
 
     // Assert
     expect(result).toHaveProperty("root");
 
-    // Verify basic structure
     const rootId = result.root;
     const rootNode = result[rootId];
     expect(rootNode.tag).toBe("PROG");
 
-    // Find the result node - expecting a single NUM node with the sum
-    let resultNode = null;
-
-    // Check all nodes for the result of evaluation (123 + 456 = 579)
+    // Find the ADD node
+    let addNode = null;
     for (const key in result) {
       if (key !== "root") {
         const node = result[key];
-        if (node.tag === "NUM" && node.elts[0] === "579") {
-          resultNode = node;
+        if (node.tag === "ADD") {
+          addNode = node;
           break;
         }
       }
     }
 
-    // We should find a node with the computed value (579)
-    expect(resultNode).not.toBeNull();
-    expect(resultNode.tag).toBe("NUM");
-    expect(resultNode.elts[0]).toBe("579");
+    expect(addNode).not.toBeNull();
+    expect(addNode.tag).toBe("ADD");
+    expect(addNode.elts.length).toBe(2);
 
-    // The original numbers should not be in the final AST
-    // if parse-time evaluation is working correctly
+    // Original operands should be preserved
     let found123 = false;
     let found456 = false;
-
     for (const key in result) {
       if (key !== "root") {
         const node = result[key];
@@ -420,11 +409,8 @@ describe("parser integration tests", () => {
         }
       }
     }
-
-    // The original operands should not be in the final AST
-    // if they were properly evaluated at parse time
-    expect(found123).toBe(false);
-    expect(found456).toBe(false);
+    expect(found123).toBe(true);
+    expect(found456).toBe(true);
   });
 
   // Tests for escaped quotes