@markw65/monkeyc-optimizer 1.1.6 → 1.1.7

package/README.md

@@ -648,4 +648,9 @@ Bug Fixes
 - Bug fixes
   - Fix an issue in restrictByEquality when restricting a union including an Enum, to a specific value of the enum.
   - Fix the display of Method types to match the syntax used in MonkeyC.
-  - Infer the type of method(:symbol) by looking up symbol.
+  - Infer the type of `method(:symbol)` by looking up symbol.
+
+### 1.1.7
+
+- Bug fixes
+  - Fix a problem with inlining that could inadvertently make locals from the callee function appear to belong to the callee's class or module. This could sometimes block optimizations, and also cause confusion for the type checker.

package/build/api.cjs

@@ -1851,9 +1851,7 @@ function findCalleesByNode(state, callee) {
 /* harmony import */ var _api__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_api__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _ast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6652);
 /* harmony import */ var _function_info__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(819);
-/* harmony import */ var _optimizer_types__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9697);
-/* harmony import */ var _variable_renamer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(4405);
-
+/* harmony import */ var _variable_renamer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(4405);
 
 
 
@@ -2075,7 +2073,7 @@ function getArgSafety(state, func, args, requireAll) {
             }
             return null;
         };
-        state.stack = func.stack;
+        state.stack = func.stack.concat(func);
         state.traverse(func.node.body);
     }
     finally {
@@ -2186,9 +2184,7 @@ function processInlineBody(state, func, call, root, params) {
     // lookup determines static-ness of the lookup context based on seeing
     // a static FunctionDeclaration, but the FunctionDeclaration's stack
     // doesn't include the FunctionDeclaration itself.
-    const stack = func.attributes & StateNodeAttributes.STATIC
-        ? func.stack.concat(func)
-        : func.stack;
+    const lookupStack = func.stack.concat(func);
     try {
         state.pre = (node) => {
             if (failed)
@@ -2244,7 +2240,7 @@ function processInlineBody(state, func, call, root, params) {
                 }
                 return null;
             }
-            const replacement = fixNodeScope(state, node, stack);
+            const replacement = fixNodeScope(state, node, lookupStack);
             if (!replacement) {
                 failed = true;
                 inlineDiagnostic(state, func, call, `Failed to resolve '${node.name}'`);

package/build/optimizer.cjs

@@ -5035,15 +5035,6 @@ function findCalleesByNode(state, callee) {
     return ((hasProperty(state.allFunctions, name) && state.allFunctions[name]) || null);
 }
 
-;// CONCATENATED MODULE: ./src/optimizer-types.ts
-var StateNodeAttributes;
-(function (StateNodeAttributes) {
-    StateNodeAttributes[StateNodeAttributes["PUBLIC"] = 1] = "PUBLIC";
-    StateNodeAttributes[StateNodeAttributes["PROTECTED"] = 2] = "PROTECTED";
-    StateNodeAttributes[StateNodeAttributes["PRIVATE"] = 4] = "PRIVATE";
-    StateNodeAttributes[StateNodeAttributes["STATIC"] = 8] = "STATIC";
-})(StateNodeAttributes || (StateNodeAttributes = {}));
-
 ;// CONCATENATED MODULE: ./src/variable-renamer.ts
 
 
@@ -5110,7 +5101,6 @@ function renameVariable(state, locals, declName) {
 
 
 
-
 // Note: Keep in sync with replaceInlinedSubExpression below
 function inlinableSubExpression(expr) {
     while (true) {
@@ -5328,7 +5318,7 @@ function getArgSafety(state, func, args, requireAll) {
             }
             return null;
         };
-        state.stack = func.stack;
+        state.stack = func.stack.concat(func);
         state.traverse(func.node.body);
     }
     finally {
@@ -5439,9 +5429,7 @@ function processInlineBody(state, func, call, root, params) {
     // lookup determines static-ness of the lookup context based on seeing
     // a static FunctionDeclaration, but the FunctionDeclaration's stack
     // doesn't include the FunctionDeclaration itself.
-    const stack = func.attributes & StateNodeAttributes.STATIC
-        ? func.stack.concat(func)
-        : func.stack;
+    const lookupStack = func.stack.concat(func);
     try {
         state.pre = (node) => {
             if (failed)
@@ -5497,7 +5485,7 @@ function processInlineBody(state, func, call, root, params) {
                 }
                 return null;
             }
-            const replacement = fixNodeScope(state, node, stack);
+            const replacement = fixNodeScope(state, node, lookupStack);
             if (!replacement) {
                 failed = true;
                 inlineDiagnostic(state, func, call, `Failed to resolve '${node.name}'`);
@@ -5953,6 +5941,15 @@ function fixNodeScope(state, lookupNode, nodeStack) {
     return null;
 }
 
+;// CONCATENATED MODULE: ./src/optimizer-types.ts
+var StateNodeAttributes;
+(function (StateNodeAttributes) {
+    StateNodeAttributes[StateNodeAttributes["PUBLIC"] = 1] = "PUBLIC";
+    StateNodeAttributes[StateNodeAttributes["PROTECTED"] = 2] = "PROTECTED";
+    StateNodeAttributes[StateNodeAttributes["PRIVATE"] = 4] = "PRIVATE";
+    StateNodeAttributes[StateNodeAttributes["STATIC"] = 8] = "STATIC";
+})(StateNodeAttributes || (StateNodeAttributes = {}));
+
 ;// CONCATENATED MODULE: ./src/pragma-checker.ts
 
 
@@ -15381,7 +15378,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
         // 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 && 1674707539512 < opt_time) {
+        if (source_time < opt_time && 1674746701563 < opt_time) {
             return { hasTests, diagnostics: prevDiagnostics };
         }
     }
@@ -15408,7 +15405,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             return promises_namespaceObject.writeFile(external_path_.join(output, "build-info.json"), JSON.stringify({
                 hasTests,
                 diagnostics,
-                optimizerVersion: "1.1.6",
+                optimizerVersion: "1.1.7",
                 ...Object.fromEntries(configOptionsToCheck.map((option) => [option, config[option]])),
             }))
                 .then(() => ({ hasTests, diagnostics }));

package/package.json

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