@markw65/monkeyc-optimizer 1.0.19 → 1.0.20

package/README.md

@@ -220,3 +220,18 @@ More fixes found via open source projects.
 - Code cleanup
   - Properly type the results of JSON.parse
   - Switch over to using ParenthesizedExpression for formatAst (depends on @markw65/prettier-plugin-monkeyc@1.0.22)
+
+### 1.0.20
+
+- Bug fixes
+
+  - Fix a bug marking unknown callees
+  - Fix a bug in test.js that didn't notice when tests failed, and fix a failing test
+
+- Optimizer enhancements
+
+  - Re-run the main optimization step, to properly account for functions that are unused after optimization
+  - Call the optimizer on 'unused' nodes before returning them
+
+- Code cleanup
+  - Called function cleanup

package/build/api.cjs

@@ -1086,6 +1086,13 @@ function evaluateFunction(func, args) {
         return false;
     }
 }
+function markFunctionCalled(state, func) {
+    if (!hasProperty(state.calledFunctions, func.id.name)) {
+        state.calledFunctions[func.id.name] = [func];
+        return;
+    }
+    pushUnique(state.calledFunctions[func.id.name], func);
+}
 async function optimizeMonkeyC(fnMap) {
     const state = {
         ...(await analyze(fnMap)),
@@ -1295,10 +1302,7 @@ async function optimizeMonkeyC(fnMap) {
                         used = checkInherited(parent, node.id.name);
                     }
                     if (used) {
-                        if (!hasProperty(state.calledFunctions, node.id.name)) {
-                            state.calledFunctions[node.id.name] = [];
-                        }
-                        state.calledFunctions[node.id.name].push(node);
+                        markFunctionCalled(state, node);
                     }
                 }
             }
@@ -1383,7 +1387,13 @@ async function optimizeMonkeyC(fnMap) {
                 else {
                     const ret = unused(node.expression, true);
                     if (ret) {
-                        return ret;
+                        return ret
+                            .map((s) => {
+                            const r2 = state.traverse(s);
+                            return r2 === false || r2 ? r2 : s;
+                        })
+                            .flat(1)
+                            .filter((s) => s !== false);
                     }
                 }
                 break;
@@ -1393,6 +1403,11 @@ async function optimizeMonkeyC(fnMap) {
     Object.values(fnMap).forEach((f) => {
         collectNamespaces(f.ast, state);
     });
+    state.calledFunctions = {};
+    state.exposed = {};
+    Object.values(fnMap).forEach((f) => {
+        collectNamespaces(f.ast, state);
+    });
     delete state.pre;
     delete state.post;
     const cleanup = (node) => {
@@ -1471,7 +1486,9 @@ async function optimizeMonkeyC(fnMap) {
     return state.diagnostics;
 }
 function optimizeCall(state, node, context) {
-    const [name, callees] = state.lookup(node.callee);
+    const [name, results] = state.lookup(node.callee);
+    const callees = results &&
+        results.filter((c) => c.type === "FunctionDeclaration");
     if (!callees || !callees.length) {
         const n = name ||
             ("name" in node.callee && node.callee.name) ||
@@ -1506,10 +1523,7 @@ function optimizeCall(state, node, context) {
             }
         }
     }
-    if (!hasProperty(state.calledFunctions, name)) {
-        state.calledFunctions[name] = [];
-    }
-    callees.forEach((c) => isStateNode(c) && pushUnique(state.calledFunctions[name], c.node));
+    callees.forEach((c) => markFunctionCalled(state, c.node));
     return null;
 }
 

package/build/optimizer.cjs

@@ -10784,11 +10784,11 @@ function launchSimulator() {
         child.unref();
     });
 }
-function simulateProgram(prg, device, test) {
+function simulateProgram(prg, device, test = false, logger) {
     const args = [prg, device];
     if (test)
         args.push("-t");
-    return (0,external_sdk_util_cjs_namespaceObject.getSdkPath)().then((sdk) => (0,external_util_cjs_namespaceObject.spawnByLine)(external_path_.resolve(sdk, "bin", "monkeydo"), args, (line) => console.log(line)).then(() => { }));
+    return (0,external_sdk_util_cjs_namespaceObject.getSdkPath)().then((sdk) => (0,external_util_cjs_namespaceObject.spawnByLine)(external_path_.resolve(sdk, "bin", "monkeydo"), args, logger || ((line) => console.log(line))).then(() => { }));
 }
 
 ;// CONCATENATED MODULE: ./src/variable-renamer.ts
@@ -11804,6 +11804,13 @@ function evaluateFunction(func, args) {
         return false;
     }
 }
+function markFunctionCalled(state, func) {
+    if (!(0,external_api_cjs_namespaceObject.hasProperty)(state.calledFunctions, func.id.name)) {
+        state.calledFunctions[func.id.name] = [func];
+        return;
+    }
+    (0,external_util_cjs_namespaceObject.pushUnique)(state.calledFunctions[func.id.name], func);
+}
 async function optimizeMonkeyC(fnMap) {
     const state = {
         ...(await analyze(fnMap)),
@@ -12013,10 +12020,7 @@ async function optimizeMonkeyC(fnMap) {
                         used = checkInherited(parent, node.id.name);
                     }
                     if (used) {
-                        if (!(0,external_api_cjs_namespaceObject.hasProperty)(state.calledFunctions, node.id.name)) {
-                            state.calledFunctions[node.id.name] = [];
-                        }
-                        state.calledFunctions[node.id.name].push(node);
+                        markFunctionCalled(state, node);
                     }
                 }
             }
@@ -12101,7 +12105,13 @@ async function optimizeMonkeyC(fnMap) {
                 else {
                     const ret = unused(node.expression, true);
                     if (ret) {
-                        return ret;
+                        return ret
+                            .map((s) => {
+                            const r2 = state.traverse(s);
+                            return r2 === false || r2 ? r2 : s;
+                        })
+                            .flat(1)
+                            .filter((s) => s !== false);
                     }
                 }
                 break;
@@ -12111,6 +12121,11 @@ async function optimizeMonkeyC(fnMap) {
     Object.values(fnMap).forEach((f) => {
         (0,external_api_cjs_namespaceObject.collectNamespaces)(f.ast, state);
     });
+    state.calledFunctions = {};
+    state.exposed = {};
+    Object.values(fnMap).forEach((f) => {
+        (0,external_api_cjs_namespaceObject.collectNamespaces)(f.ast, state);
+    });
     delete state.pre;
     delete state.post;
     const cleanup = (node) => {
@@ -12189,7 +12204,9 @@ async function optimizeMonkeyC(fnMap) {
     return state.diagnostics;
 }
 function optimizeCall(state, node, context) {
-    const [name, callees] = state.lookup(node.callee);
+    const [name, results] = state.lookup(node.callee);
+    const callees = results &&
+        results.filter((c) => c.type === "FunctionDeclaration");
     if (!callees || !callees.length) {
         const n = name ||
             ("name" in node.callee && node.callee.name) ||
@@ -12224,10 +12241,7 @@ function optimizeCall(state, node, context) {
             }
         }
     }
-    if (!(0,external_api_cjs_namespaceObject.hasProperty)(state.calledFunctions, name)) {
-        state.calledFunctions[name] = [];
-    }
-    callees.forEach((c) => (0,external_api_cjs_namespaceObject.isStateNode)(c) && (0,external_util_cjs_namespaceObject.pushUnique)(state.calledFunctions[name], c.node));
+    callees.forEach((c) => markFunctionCalled(state, c.node));
     return null;
 }
 
@@ -12726,7 +12740,7 @@ async function generateOneConfig(buildConfig, dependencyFiles, config) {
         // the oldest optimized file, we don't need to regenerate
         const source_time = await (0,external_util_cjs_namespaceObject.last_modified)(Object.keys(fnMap).concat(dependencyFiles));
         const opt_time = await (0,external_util_cjs_namespaceObject.first_modified)(Object.values(fnMap).map((v) => v.output));
-        if (source_time < opt_time && 1654554780017 < opt_time) {
+        if (source_time < opt_time && 1654708837029 < opt_time) {
             return { hasTests, diagnostics: prevDiagnostics };
         }
     }

package/build/src/launch.d.ts

@@ -1,2 +1,3 @@
+import { LineHandler } from "./util";
 export declare function launchSimulator(): Promise<void>;
-export declare function simulateProgram(prg: string, device: string, test?: boolean): Promise<void>;
+export declare function simulateProgram(prg: string, device: string, test?: boolean, logger?: LineHandler | LineHandler[]): Promise<void>;

package/build/src/optimizer.d.ts

@@ -121,7 +121,7 @@ declare global {
             [key: string]: true;
         };
         calledFunctions?: {
-            [key: string]: unknown[];
+            [key: string]: mctree.FunctionDeclaration[];
         };
         localsStack?: {
             node?: mctree.Node;

package/build/src/util.d.ts

@@ -2,12 +2,11 @@ import * as glob from "glob";
 export declare function globa(pattern: string, options?: glob.IOptions): Promise<Array<string>>;
 export declare function last_modified(inputs: string[]): Promise<number>;
 export declare function first_modified(inputs: string[]): Promise<number>;
-export declare function pushUnique<T>(arr: T[], value: T): void;
-declare type LineHandler = (line: string) => void;
+export declare function pushUnique<T, U extends T>(arr: T[], value: U): void;
+export declare type LineHandler = (line: string) => void;
 export declare function spawnByLine(command: string, args: string[], lineHandlers: LineHandler | LineHandler[], options?: {
     [key: string]: unknown;
 }): Promise<void>;
 export declare function readByLine(file: string, lineHandler: LineHandler): Promise<unknown>;
 export declare function promiseAll<T>(promiseFn: (i: number) => Promise<T>, parallelism: number): Promise<T[]>;
 export declare function copyRecursiveAsNeeded(source: string, target: string, filter?: (src: string, tgt: string) => boolean): Promise<void>;
-export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",