@markw65/monkeyc-optimizer 1.1.32 → 1.1.33

package/README.md

@@ -922,3 +922,17 @@ No functional change, just fixes a typo that broke the typescript exports.
   - sdk-6.2.x fixes [this finally bug](https://forums.garmin.com/developer/connect-iq/i/bug-reports/finally-doesn-t-work-as-expected), so that now all the examples work correctly (ie the `finally` block always executes, as expected, no matter how you exit the `try` or `catch` blocks). I've updated the way the control flow graph is built to match this behavior.
 
   - sdk-6.2.x fixes [this continue in switch issue](https://forums.garmin.com/developer/connect-iq/i/bug-reports/continue-in-a-switch-statement-behaves-surprisingly), by making `continue` in a `switch` continue the loop containing the switch (or its a compile time error if there's no loop). This matches the behavior of C and C++, for example. I've updated the optimizer to interpret `continue` appropriately, depending on the sdk version.
+
+### 1.1.33
+
+- Update to [@markw65/prettier-plugin-monkeyc@1.0.51](https://github.com/markw65/prettier-plugin-monkeyc#1051)
+
+  - Makes it compatible with prettier@3.0.0
+
+- Bug fixes
+
+  - Fix a problem that could incorrectly optimize an array-init
+
+- Optimizations
+
+  - Enable the array-init optimization in a few more cases

package/build/api.cjs

@@ -18,44 +18,44 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_NUE3G2QE.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_NUE3G2QE.collectNamespaces,
-  createDocumentationMap: () => import_chunk_NUE3G2QE.createDocumentationMap,
-  diagnostic: () => import_chunk_NUE3G2QE.diagnostic,
-  diagnosticHelper: () => import_chunk_NUE3G2QE.diagnosticHelper,
-  findNamesInScope: () => import_chunk_NUE3G2QE.findNamesInScope,
-  findUsingForNode: () => import_chunk_NUE3G2QE.findUsingForNode,
-  formatAst: () => import_chunk_NUE3G2QE.formatAst,
-  formatAstLongLines: () => import_chunk_NUE3G2QE.formatAstLongLines,
-  getApiFunctionInfo: () => import_chunk_NUE3G2QE.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_NUE3G2QE.getApiMapping,
-  getSuperClasses: () => import_chunk_NUE3G2QE.getSuperClasses,
+  checkCompilerVersion: () => import_chunk_7ANQTFGD.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_7ANQTFGD.collectNamespaces,
+  createDocumentationMap: () => import_chunk_7ANQTFGD.createDocumentationMap,
+  diagnostic: () => import_chunk_7ANQTFGD.diagnostic,
+  diagnosticHelper: () => import_chunk_7ANQTFGD.diagnosticHelper,
+  findNamesInScope: () => import_chunk_7ANQTFGD.findNamesInScope,
+  findUsingForNode: () => import_chunk_7ANQTFGD.findUsingForNode,
+  formatAst: () => import_chunk_7ANQTFGD.formatAst,
+  formatAstLongLines: () => import_chunk_7ANQTFGD.formatAstLongLines,
+  getApiFunctionInfo: () => import_chunk_7ANQTFGD.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_7ANQTFGD.getApiMapping,
+  getSuperClasses: () => import_chunk_7ANQTFGD.getSuperClasses,
   hasProperty: () => import_chunk_MBTLUWXR.hasProperty,
-  isClassVariable: () => import_chunk_NUE3G2QE.isClassVariable,
-  isLocal: () => import_chunk_NUE3G2QE.isLocal,
-  isLookupCandidate: () => import_chunk_NUE3G2QE.isLookupCandidate,
-  isStateNode: () => import_chunk_NUE3G2QE.isStateNode,
-  lookupByFullName: () => import_chunk_NUE3G2QE.lookupByFullName,
-  lookupNext: () => import_chunk_NUE3G2QE.lookupNext,
-  lookupResultContains: () => import_chunk_NUE3G2QE.lookupResultContains,
-  lookupWithType: () => import_chunk_NUE3G2QE.lookupWithType,
-  makeToyboxLink: () => import_chunk_NUE3G2QE.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_NUE3G2QE.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_NUE3G2QE.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_NUE3G2QE.parseSdkVersion,
-  sameLookupResult: () => import_chunk_NUE3G2QE.sameLookupResult,
+  isClassVariable: () => import_chunk_7ANQTFGD.isClassVariable,
+  isLocal: () => import_chunk_7ANQTFGD.isLocal,
+  isLookupCandidate: () => import_chunk_7ANQTFGD.isLookupCandidate,
+  isStateNode: () => import_chunk_7ANQTFGD.isStateNode,
+  lookupByFullName: () => import_chunk_7ANQTFGD.lookupByFullName,
+  lookupNext: () => import_chunk_7ANQTFGD.lookupNext,
+  lookupResultContains: () => import_chunk_7ANQTFGD.lookupResultContains,
+  lookupWithType: () => import_chunk_7ANQTFGD.lookupWithType,
+  makeToyboxLink: () => import_chunk_7ANQTFGD.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_7ANQTFGD.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_7ANQTFGD.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_7ANQTFGD.parseSdkVersion,
+  sameLookupResult: () => import_chunk_7ANQTFGD.sameLookupResult,
   traverseAst: () => import_chunk_MBTLUWXR.traverseAst,
-  variableDeclarationName: () => import_chunk_NUE3G2QE.variableDeclarationName,
-  visitReferences: () => import_chunk_NUE3G2QE.visitReferences,
-  visit_resources: () => import_chunk_NUE3G2QE.visit_resources,
-  visitorNode: () => import_chunk_NUE3G2QE.visitorNode
+  variableDeclarationName: () => import_chunk_7ANQTFGD.variableDeclarationName,
+  visitReferences: () => import_chunk_7ANQTFGD.visitReferences,
+  visit_resources: () => import_chunk_7ANQTFGD.visit_resources,
+  visitorNode: () => import_chunk_7ANQTFGD.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_NUE3G2QE = require("./chunk-NUE3G2QE.cjs");
+var import_chunk_7ANQTFGD = require("./chunk-7ANQTFGD.cjs");
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_NUE3G2QE.init_api)();
+(0, import_chunk_7ANQTFGD.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-NUE3G2QE.cjs → chunk-7ANQTFGD.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_NUE3G2QE_exports = {};
-__export(chunk_NUE3G2QE_exports, {
+var chunk_7ANQTFGD_exports = {};
+__export(chunk_7ANQTFGD_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -122,7 +122,7 @@ __export(chunk_NUE3G2QE_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_NUE3G2QE_exports);
+module.exports = __toCommonJS(chunk_7ANQTFGD_exports);
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -22562,6 +22562,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
     interpState = cloneState2(null);
   }
   const putvStarts = [];
+  const dupsToFix = [];
   let i;
   let initInst = null;
   let initType = null;
@@ -22594,6 +22595,12 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         usedLocals |= 1n << BigInt(bc.arg);
       }
       const delta = interpState.stack.length - depth;
+      if (delta < 0) {
+        break;
+      }
+      if (bc.op === 46 && bc.arg >= delta - 1) {
+        dupsToFix[k] = putvStarts.length;
+      }
       if (delta === 3) {
         const t = interpState.stack[interpState.stack.length - 1].type;
         if (bc.op === 18) {
@@ -22607,9 +22614,6 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         }
         thisInit = null;
       }
-      if (delta < 0 || bc.op === 46 && bc.arg >= delta - 1) {
-        break;
-      }
     }
     if (found === i)
       break;
@@ -22677,6 +22681,11 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         /* aputv */
       );
     };
+    dupsToFix.forEach((x, n) => {
+      const bc = block.bytecodes[n];
+      (0, import_node_assert9.default)(bc.op === 46 && bc.arg >= 2);
+      bc.arg -= 2;
+    });
     convertAputv(i - 1);
     for (let i2 = putvStarts.length; i2--; ) {
       const offset = putvStarts[i2];
@@ -22796,6 +22805,11 @@ ${blockToString(block, context)}`
   if (local >= 0) {
     block.bytecodes.splice(i, 0, bytecode(2, void 0));
   }
+  dupsToFix.forEach((x, n) => {
+    const bc = block.bytecodes[n];
+    (0, import_node_assert9.default)(bc.op === 46 && bc.arg >= 2);
+    bc.arg += (putvStarts.length - x - 1) * 2;
+  });
   for (let i2 = putvStarts.length; i2-- > 1; ) {
     block.bytecodes.splice(putvStarts[i2], 2);
   }
@@ -29893,7 +29907,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_PVBIKZYZ.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1690215897566 < opt_time) {
+      if (source_time < opt_time && 1690936956222 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29931,7 +29945,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.32",
+            optimizerVersion: "1.1.33",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )

package/build/optimizer.cjs

@@ -18,29 +18,29 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_NUE3G2QE.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_NUE3G2QE.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_7ANQTFGD.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_7ANQTFGD.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_PVBIKZYZ.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_NUE3G2QE.defaultConfig,
-  display: () => import_chunk_NUE3G2QE.display,
-  generateApiMirTests: () => import_chunk_NUE3G2QE.generateApiMirTests,
-  generateOneConfig: () => import_chunk_NUE3G2QE.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_NUE3G2QE.generateOptimizedProject,
-  getConfig: () => import_chunk_NUE3G2QE.getConfig,
-  getProjectAnalysis: () => import_chunk_NUE3G2QE.getProjectAnalysis,
-  get_jungle: () => import_chunk_NUE3G2QE.get_jungle,
-  isErrorWithLocation: () => import_chunk_NUE3G2QE.isErrorWithLocation,
-  launchSimulator: () => import_chunk_NUE3G2QE.launchSimulator,
-  manifestProducts: () => import_chunk_NUE3G2QE.manifestProducts,
-  mctree: () => import_chunk_NUE3G2QE.mctree,
-  simulateProgram: () => import_chunk_NUE3G2QE.simulateProgram
+  defaultConfig: () => import_chunk_7ANQTFGD.defaultConfig,
+  display: () => import_chunk_7ANQTFGD.display,
+  generateApiMirTests: () => import_chunk_7ANQTFGD.generateApiMirTests,
+  generateOneConfig: () => import_chunk_7ANQTFGD.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_7ANQTFGD.generateOptimizedProject,
+  getConfig: () => import_chunk_7ANQTFGD.getConfig,
+  getProjectAnalysis: () => import_chunk_7ANQTFGD.getProjectAnalysis,
+  get_jungle: () => import_chunk_7ANQTFGD.get_jungle,
+  isErrorWithLocation: () => import_chunk_7ANQTFGD.isErrorWithLocation,
+  launchSimulator: () => import_chunk_7ANQTFGD.launchSimulator,
+  manifestProducts: () => import_chunk_7ANQTFGD.manifestProducts,
+  mctree: () => import_chunk_7ANQTFGD.mctree,
+  simulateProgram: () => import_chunk_7ANQTFGD.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_NUE3G2QE = require("./chunk-NUE3G2QE.cjs");
+var import_chunk_7ANQTFGD = require("./chunk-7ANQTFGD.cjs");
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_NUE3G2QE.init_optimizer)();
+(0, import_chunk_7ANQTFGD.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,

package/build/sdk-util.cjs

@@ -18,25 +18,25 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var sdk_util_exports = {};
 __export(sdk_util_exports, {
-  SectionKinds: () => import_chunk_NUE3G2QE.SectionKinds,
-  appSupport: () => import_chunk_NUE3G2QE.appSupport,
-  connectiq: () => import_chunk_NUE3G2QE.connectiq,
-  getDeviceInfo: () => import_chunk_NUE3G2QE.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_NUE3G2QE.getFunctionDocumentation,
-  getLanguages: () => import_chunk_NUE3G2QE.getLanguages,
-  getSdkPath: () => import_chunk_NUE3G2QE.getSdkPath,
-  isWin: () => import_chunk_NUE3G2QE.isWin,
-  optimizeProgram: () => import_chunk_NUE3G2QE.optimizeProgram,
-  readPrg: () => import_chunk_NUE3G2QE.readPrg,
-  readPrgWithOffsets: () => import_chunk_NUE3G2QE.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_NUE3G2QE.xml_util_exports
+  SectionKinds: () => import_chunk_7ANQTFGD.SectionKinds,
+  appSupport: () => import_chunk_7ANQTFGD.appSupport,
+  connectiq: () => import_chunk_7ANQTFGD.connectiq,
+  getDeviceInfo: () => import_chunk_7ANQTFGD.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_7ANQTFGD.getFunctionDocumentation,
+  getLanguages: () => import_chunk_7ANQTFGD.getLanguages,
+  getSdkPath: () => import_chunk_7ANQTFGD.getSdkPath,
+  isWin: () => import_chunk_7ANQTFGD.isWin,
+  optimizeProgram: () => import_chunk_7ANQTFGD.optimizeProgram,
+  readPrg: () => import_chunk_7ANQTFGD.readPrg,
+  readPrgWithOffsets: () => import_chunk_7ANQTFGD.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_7ANQTFGD.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_NUE3G2QE = require("./chunk-NUE3G2QE.cjs");
+var import_chunk_7ANQTFGD = require("./chunk-7ANQTFGD.cjs");
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_NUE3G2QE.init_sdk_util)();
+(0, import_chunk_7ANQTFGD.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/projects.d.ts

@@ -14,6 +14,7 @@ export type RemoteProject = string | {
     jungleContent?: string[];
     garminOptLevel?: number;
     test?: boolean | string[];
+    branch?: string;
 };
 export declare const githubProjects: RemoteProject[];
 export declare function fetchGitProjects(projects: RemoteProject[], testOnly: boolean, skipRemote: boolean): Promise<(string | {

package/build/worker-thread.cjs

@@ -21,17 +21,17 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_NUE3G2QE = require("./chunk-NUE3G2QE.cjs");
+var import_chunk_7ANQTFGD = require("./chunk-7ANQTFGD.cjs");
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
 var import_node_worker_threads = require("node:worker_threads");
 var require_worker_thread = (0, import_chunk_ABYVSU2C.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_NUE3G2QE.init_worker_task)();
+    (0, import_chunk_7ANQTFGD.init_worker_task)();
     if (import_node_worker_threads.parentPort) {
       import_node_worker_threads.parentPort.on("message", async (task) => {
-        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_NUE3G2QE.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_7ANQTFGD.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.32",
+  "version": "1.1.33",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -48,7 +48,7 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.49"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.51"
   },
   "devDependencies": {
     "@types/chai": "^4.3.4",