@markw65/monkeyc-optimizer 1.0.27 → 1.0.28

package/README.md

@@ -298,3 +298,8 @@ More fixes found via open source projects.
 - Bug fixes
   - Update to `@markw65/prettier-plugin-monkeyc@1.0.29` to fix certain obscure comment related bugs
   - When replacing a node (espcially when inlining), delete any comments contained in the old node.
+
+### 1.0.28
+
+- Bug fixes
+  - In some circumstances, while inlining, a parameter could be substituted, and then reprocessed. During reprocessing, it would attempt to lookup the replacement symbol, and if that was a local from the calling function it would fail (since an inline function never has access to the caller's locals). Prevent the reprocessing step from happening.

package/build/api.cjs

@@ -463,6 +463,7 @@ function processInlineBody(state, func, call, root, params) {
     const post = state.post;
     state.inlining = true;
     let insertedVariableDecls = null;
+    const replacements = new Set();
     try {
         state.pre = (node) => {
             if (failed)
@@ -470,7 +471,7 @@ function processInlineBody(state, func, call, root, params) {
             node.start = call.start;
             node.end = call.end;
             node.loc = call.loc;
-            if (node === insertedVariableDecls)
+            if (replacements.has(node))
                 return false;
             const result = pre(node, state);
             if (!insertedVariableDecls && node.type === "BlockStatement") {
@@ -498,6 +499,7 @@ function processInlineBody(state, func, call, root, params) {
                     kind: "var",
                 };
                 node.body.unshift(insertedVariableDecls);
+                replacements.add(insertedVariableDecls);
             }
             return result;
         };
@@ -513,6 +515,8 @@ function processInlineBody(state, func, call, root, params) {
                         const ix = params[node.name];
                         if (ix >= 0) {
                             replacement = call.arguments[ix];
+                            replacements.add(replacement);
+                            return replacement;
                         }
                         break;
                     }

package/build/optimizer.cjs

@@ -11187,6 +11187,7 @@ function processInlineBody(state, func, call, root, params) {
     const post = state.post;
     state.inlining = true;
     let insertedVariableDecls = null;
+    const replacements = new Set();
     try {
         state.pre = (node) => {
             if (failed)
@@ -11194,7 +11195,7 @@ function processInlineBody(state, func, call, root, params) {
             node.start = call.start;
             node.end = call.end;
             node.loc = call.loc;
-            if (node === insertedVariableDecls)
+            if (replacements.has(node))
                 return false;
             const result = pre(node, state);
             if (!insertedVariableDecls && node.type === "BlockStatement") {
@@ -11222,6 +11223,7 @@ function processInlineBody(state, func, call, root, params) {
                     kind: "var",
                 };
                 node.body.unshift(insertedVariableDecls);
+                replacements.add(insertedVariableDecls);
             }
             return result;
         };
@@ -11237,6 +11239,8 @@ function processInlineBody(state, func, call, root, params) {
                         const ix = params[node.name];
                         if (ix >= 0) {
                             replacement = call.arguments[ix];
+                            replacements.add(replacement);
+                            return replacement;
                         }
                         break;
                     }
@@ -13105,7 +13109,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 && 1655851904193 < opt_time) {
+        if (source_time < opt_time && 1655916886685 < opt_time) {
             return { hasTests, diagnostics: prevDiagnostics };
         }
     }

package/package.json

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