almost overhauled generator tests

Author: reedM2

src/generator.js

@@ -23,12 +23,18 @@ export default function generate(program) {
       /**
        * Standard generator code used in every file.
        */
+      this.functions = new Map();
+      p.statements.forEach(s => {
+        if (s.kind === "FuncDef") {
+          this.functions.set(s.name, s);
+        }
+      });
       const range = p.globalRange?.[0]?.range;
       const timestep = p.globalRange?.[0]?.timestep?.[0];
       const start = range ? gen(range.start) : 1;
       const end = range ? gen(range.end[0]) : 5;
       const step = timestep ? gen(timestep.value) :
-                   start <= end ? 1 : -1;
+        start <= end ? 1 : -1;
       inputCode.push(`
         import { createInterface } from "node:readline/promises";
         import { stdin as input, stdout as output } from "node:process";
@@ -108,17 +114,8 @@ export default function generate(program) {
 
       // check for slices in the body of the function
       if (d.body.kind === "SliceExpr") {
-        const sliceExpressions = d.body.expressions.map(expr => {
-          return `${gen(expr)}`;
-        }).join(", ");
-
-        output.push(`function ${funcName}(${param}) {
-          return [${sliceExpressions}];
-        }`);
-      } else {
-        // handle same as before if not a slice
-        const lastStmt = body.pop();
-        output.push(`function ${funcName}(${param}) {\n${body}\nreturn ${lastStmt};\n} `);
+        const sliceExpressions = d.body.expressions.map(expr => gen(expr)).join(", ");
+        output.push(`function ${funcName}(${param}) { return [${sliceExpressions}]; }`);
       }
       if (!instantiatedMutableRanges.has(param)) {
         output.push(`let ${param} = initializeMutableRange();`);
@@ -135,6 +132,7 @@ export default function generate(program) {
       const stepValue = gen(s.stepValue);
       const arg = targetName(s.expr.arg);
       output.push(`applyFunction(${arg}, ${stepValue}, ${expr});`);
+      return `${arg}.values[${arg}.index]`;
     },
 
     Expr(e) {
@@ -221,13 +219,13 @@ export default function generate(program) {
       return `${gen(e.id)}.values.slice(0, ${gen(e.timeValue)})`;
     },
 
-    InputStmt(e) {
-      inputCode.push(`
-        console.log(${gen(e.prompt[0])});
-        const inputVar__${inputIndex} = await rl.question("Input: ");
-      `);
-      return `inputVar__${inputIndex++}`
-    },
+    // InputStmt(e) {
+    //   inputCode.push(`
+    //     console.log(${gen(e.prompt[0])});
+    //     const inputVar__${inputIndex} = await rl.question("Input: ");
+    //   `);
+    //   return `inputVar__${inputIndex++}`
+    // },
 
     num(n) {
       return n.value;