@markw65/monkeyc-optimizer 1.1.52 → 1.1.54

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.54
+
+- Fix return types of Dictionary.values() and Dictionary.keys()
+- Fix issue with single-copy-prop creating stores that the Garmin compiler can't parse
+- Handle percentage strings in resources
+- Handle special strings in <param> nodes
+- Don't treat '@Dotted.Name' as special in strings and jsonData
+- Include ipush2 and ipush3 in pre
+
+### 1.1.53
+
+- Update to [@markw65/prettier-plugin-monkeyc@1.0.56](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1056)
+  - Allows excludeAnnotations on typedefs
+- Allows arbitrary initializers for enums
+- Fix a few nits with the post build optimizer
+
 ### 1.1.52
 
 - Add support for System 5 .prg files, including new bytecodes.

package/build/api.cjs

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

package/build/{chunk-J5XJWBYV.cjs → chunk-5K64MLXC.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_J5XJWBYV_exports = {};
-__export(chunk_J5XJWBYV_exports, {
+var chunk_5K64MLXC_exports = {};
+__export(chunk_5K64MLXC_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -133,7 +133,7 @@ __export(chunk_J5XJWBYV_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_J5XJWBYV_exports);
+module.exports = __toCommonJS(chunk_5K64MLXC_exports);
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -5896,7 +5896,11 @@ function shouldInline(state, func, call, context) {
         state,
         func,
         call,
-        "This function can only be inlined in statement, assignment, if or return contexts"
+        "This function can only be inlined in statement, assignment, if or return contexts",
+        {
+          uri: "https://github.com/markw65/monkeyc-optimizer/wiki/Inlining#so-inlining-is-restricted-to-a-few-fairly-common-places-or-contexts",
+          message: "contexts"
+        }
       );
     }
     return context != null;
@@ -6128,7 +6132,7 @@ function unused(state, expression, top) {
   }
   return top ? null : [estmt(expression)];
 }
-function inlineDiagnostic(state, func, call, message) {
+function inlineDiagnostic(state, func, call, message, extra) {
   if (inlineRequested(state, func)) {
     if (!state.inlineDiagnostics) {
       state.inlineDiagnostics = {};
@@ -6138,7 +6142,7 @@ function inlineDiagnostic(state, func, call, message) {
       call,
       message && `While inlining ${func.node.id.name}: ${message}`,
       "INFO",
-      void 0
+      extra
     );
   }
 }
@@ -9382,7 +9386,7 @@ function getSystemCallTable(state) {
             returnType.value = value2;
           }
         }
-        ret.returnType = { type: 512, value: returnType };
+        ret.returnType = returnType;
       }
     }
     return ret;
@@ -9414,7 +9418,7 @@ function getSystemCallTable(state) {
             returnType.value = value2;
           }
         }
-        ret.returnType = { type: 512, value: returnType };
+        ret.returnType = returnType;
       }
     }
     return ret;
@@ -13576,6 +13580,20 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       case "def": {
         const lval = event.node.type === "UpdateExpression" ? event.node.argument : event.node.type === "AssignmentExpression" ? event.node.left : null;
         if (lval) {
+          if (nodeCopyProp.size && lval.type === "MemberExpression") {
+            let t = lval;
+            while (t.type === "MemberExpression") {
+              t = t.object;
+            }
+            const target = nodeCopyProp.get(t);
+            if (target) {
+              const copyExpr = target.type === "AssignmentExpression" ? target.right : target.type === "VariableDeclarator" ? target.init : null;
+              if (copyExpr?.type === "BinaryExpression") {
+                nodeCopyProp.set(target, false);
+                nodeCopyProp.delete(t);
+              }
+            }
+          }
           if (declIsLocal(event.decl)) {
             if (!istate.localLvals) {
               istate.localLvals = /* @__PURE__ */ new Set();
@@ -16674,7 +16692,11 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
     const ret = preEvaluate(istate, node);
     switch (node.type) {
       case "EnumDeclaration":
-        return [];
+        return ["body"];
+      case "EnumStringBody":
+        return ["members"];
+      case "EnumStringMember":
+        return ["init"];
       case "ForStatement": {
         const map2 = topLocals().map;
         if (map2) {
@@ -17101,20 +17123,18 @@ function cleanup(state, node, ast) {
         const name = "name" in m ? m.name : m.id.name;
         return (0, import_chunk_MBTLUWXR.hasProperty)(state.index, name) && !(0, import_chunk_MBTLUWXR.hasProperty)(state.exposed, name) && !(0, import_chunk_MBTLUWXR.hasProperty)(state.usedByName, name);
       })) {
-        node.enumType = [
-          ...new Set(
-            node.members.map((m) => {
-              if (!("init" in m))
-                return "Number";
-              const [node2, type] = (0, import_chunk_MBTLUWXR.getNodeValue)(m.init);
-              if (!node2) {
-                throw new Error("Failed to get type for eliminated enum");
-              }
-              return type;
-            })
-          )
-        ].join(" or ");
-        node.members.splice(0);
+        const enumType = new Set(
+          node.members.map((m) => {
+            if (!("init" in m))
+              return "Number";
+            const [node2, type] = (0, import_chunk_MBTLUWXR.getNodeValue)(m.init);
+            return node2 ? type : null;
+          })
+        );
+        if (!enumType.has(null)) {
+          node.enumType = [...enumType].join(" or ");
+          node.members.splice(0);
+        }
       }
       break;
     case "EnumDeclaration":
@@ -17514,7 +17534,7 @@ function visit_resource_refs(state, doc, e) {
       name = name.substring(1);
       loc = (0, import_chunk_MBTLUWXR.adjustLoc)(loc, 1, 0);
     }
-    if ((0, import_chunk_MBTLUWXR.hasProperty)(skip, name)) {
+    if ((0, import_chunk_MBTLUWXR.hasProperty)(skip, name) || /^\d+(\.\d+)?%?$/.test(name)) {
       return;
     }
     if (/^([-\w_$]+\s*\.\s*)*[-\w_$]+$/.test(name)) {
@@ -17588,7 +17608,12 @@ function visit_resource_refs(state, doc, e) {
     switch (element.name) {
       case "param":
         if (id === null) {
-          parseArg(dotted, l);
+          const name = element.attr.name?.value.value;
+          parseArg(
+            dotted,
+            l,
+            name && (0, import_chunk_MBTLUWXR.hasProperty)(drawableSkips, name) ? drawableSkips[name] : null
+          );
         }
         return;
       case "drawable":
@@ -17626,16 +17651,22 @@ function visit_resource_refs(state, doc, e) {
       });
       const content = doc.textContent(node);
       if (content) {
-        stringToScopedName(
-          node,
-          null,
-          content,
-          (0, import_chunk_MBTLUWXR.locRange)(
-            node.children[0].loc,
-            node.children[node.children.length - 1].loc
-          )
-        );
-        return false;
+        switch (node.name) {
+          case "string":
+          case "jsonData":
+            return false;
+          default:
+            stringToScopedName(
+              node,
+              null,
+              content,
+              (0, import_chunk_MBTLUWXR.locRange)(
+                node.children[0].loc,
+                node.children[node.children.length - 1].loc
+              )
+            );
+            return false;
+        }
       }
       return;
     }
@@ -17831,7 +17862,9 @@ var init_resources = (0, import_chunk_ABYVSU2C.__esm)({
     init_sdk_util();
     drawableSkips = {
       x: { center: true, left: true, right: true, start: true },
+      locX: { center: true, left: true, right: true, start: true },
       y: { center: true, top: true, bottom: true, start: true },
+      locY: { center: true, top: true, bottom: true, start: true },
       width: { fill: true },
       height: { fill: true },
       a: { fill: true },
@@ -18723,17 +18756,16 @@ function stateFuncs() {
                   }
                   const name = m.id.name;
                   const init = (0, import_chunk_MBTLUWXR.getLiteralNode)(m.init);
-                  if (!init) {
-                    throw new Error("Unexpected enum initializer");
-                  }
-                  if (init !== m.init) {
-                    if (m.init.enumType) {
-                      init.enumType = m.init.enumType;
+                  if (init) {
+                    if (init !== m.init) {
+                      if (m.init.enumType) {
+                        init.enumType = m.init.enumType;
+                      }
+                      m.init = init;
+                    }
+                    if (init.type === "Literal" && init.raw && import_prettier_plugin_monkeyc4.LiteralIntegerRe.test(init.raw)) {
+                      prev = init.value;
                     }
-                    m.init = init;
-                  }
-                  if (init.type === "Literal" && init.raw && import_prettier_plugin_monkeyc4.LiteralIntegerRe.test(init.raw)) {
-                    prev = init.value;
                   }
                   if (!(0, import_chunk_MBTLUWXR.hasProperty)(values, name)) {
                     values[name] = [];
@@ -19762,7 +19794,7 @@ function parseCode(view, lineTable) {
       case 29:
       case 30:
       case 31:
-        return { op, offset, size: 1 };
+        return { op, offset };
       case 42:
       case 34:
       case 33:
@@ -19786,7 +19818,7 @@ function parseCode(view, lineTable) {
       case 68:
       case 73:
       case 75:
-        return { op, offset, size: 1 };
+        return { op, offset };
       case 1:
       case 15:
       case 18:
@@ -19795,7 +19827,7 @@ function parseCode(view, lineTable) {
       case 46:
       case 53:
       case 56:
-        return { op, arg: view.getUint8(current++), offset, size: 2 };
+        return { op, arg: view.getUint8(current++), offset };
       case 25:
       case 35:
       case 40:
@@ -19803,22 +19835,19 @@ function parseCode(view, lineTable) {
         return {
           op,
           arg: offset + view.getInt16((current += 2) - 2) + 3,
-          offset,
-          size: 3
+          offset
         };
       case 57:
         return {
           op,
           arg: view.getInt16((current += 2) - 2),
-          offset,
-          size: 3
+          offset
         };
       case 58:
         return {
           op,
           arg: view.getInt32((current += 3) - 3) >> 8,
-          offset,
-          size: 4
+          offset
         };
       case 24:
       case 64:
@@ -19829,7 +19858,7 @@ function parseCode(view, lineTable) {
       case 52:
       case 71:
       case 67:
-        return { op, arg: view.getInt32((current += 4) - 4), offset, size: 5 };
+        return { op, arg: view.getInt32((current += 4) - 4), offset };
       case 69:
         return {
           op,
@@ -19837,8 +19866,7 @@ function parseCode(view, lineTable) {
             module: view.getInt32((current += 4) - 4),
             var: view.getInt32((current += 4) - 4)
           },
-          offset,
-          size: 9
+          offset
         };
       case 70:
         return {
@@ -19847,8 +19875,7 @@ function parseCode(view, lineTable) {
             local: view.getUint8(current++),
             var: view.getInt32((current += 4) - 4)
           },
-          offset,
-          size: 6
+          offset
         };
       case 74:
         return {
@@ -19857,29 +19884,25 @@ function parseCode(view, lineTable) {
             argc: view.getUint8(current++),
             incsp: view.getUint8(current++)
           },
-          offset,
-          size: 3
+          offset
         };
       case 49:
         return {
           op,
           arg: view.getBigInt64((current += 8) - 8),
-          offset,
-          size: 9
+          offset
         };
       case 38:
         return {
           op,
           arg: view.getFloat32((current += 4) - 4),
-          offset,
-          size: 5
+          offset
         };
       case 50:
         return {
           op,
           arg: view.getFloat64((current += 8) - 8),
-          offset,
-          size: 9
+          offset
         };
       case 36:
         throw new Error(`Unknown opcode ${op}`);
@@ -19896,7 +19919,7 @@ function parseCode(view, lineTable) {
     }
     results.push(nextOp);
   }
-  results.push({ op: 0, size: 1, offset: current });
+  results.push({ op: 0, offset: current });
   return results;
 }
 function opcodeSize(op) {
@@ -19945,6 +19968,8 @@ function opcodeSize(op) {
     case 68:
     case 73:
     case 75:
+    case 10:
+    case 11:
       return 1;
     case 1:
     case 15:
@@ -19953,8 +19978,6 @@ function opcodeSize(op) {
     case 43:
     case 46:
     case 53:
-    case 10:
-    case 11:
     case 56:
       return 2;
     case 25:
@@ -21191,6 +21214,8 @@ function interpFunc(func, context) {
           break;
         }
         case 37:
+        case 57:
+        case 58:
         case 49:
         case 38:
         case 50:
@@ -21212,7 +21237,6 @@ function interpFunc(func, context) {
                 op: 46,
                 arg,
                 offset: bc.offset,
-                size: 2,
                 invert: localState.stack.length <= ~index
               });
             } else {
@@ -21221,7 +21245,6 @@ function interpFunc(func, context) {
                 op: 18,
                 arg,
                 offset: bc.offset,
-                size: 2,
                 invert: localState.locals.length <= index
               });
             }
@@ -21400,11 +21423,9 @@ function interpFunc(func, context) {
       } else {
         delete orig.arg;
       }
-      orig.size = rep.size;
       if (rep.invert) {
         const invv = { ...orig };
         invv.op = 45;
-        invv.size = 1;
         invv.offset = context.nextOffset++;
         delete invv.arg;
         block.bytecodes.splice(i + 1, 0, invv);
@@ -21434,7 +21455,6 @@ function interpFunc(func, context) {
       for (let i = 0; i < pops; i++) {
         block.bytecodes.push({
           op: 2,
-          size: 1,
           offset: context.nextOffset++
         });
       }
@@ -21453,38 +21473,35 @@ function instForType(type, offset) {
     return null;
   switch (type.type) {
     case 1:
-      return { op: 44, offset, size: 1 };
+      return { op: 44, offset };
     case 2:
     case 4:
       return {
         op: 43,
         arg: type.type === 2 ? 0 : 1,
-        offset,
-        size: 1
+        offset
       };
     case 8:
-      return { op: 37, arg: type.value, offset, size: 1 };
+      return { op: 37, arg: type.value, offset };
     case 16:
-      return { op: 49, arg: type.value, offset, size: 1 };
+      return { op: 49, arg: type.value, offset };
     case 32:
-      return { op: 38, arg: type.value, offset, size: 1 };
+      return { op: 38, arg: type.value, offset };
     case 64:
-      return { op: 50, arg: type.value, offset, size: 1 };
+      return { op: 50, arg: type.value, offset };
     case 128:
       return {
         op: 52,
         arg: type.value.charCodeAt(0),
-        offset,
-        size: 1
+        offset
       };
     case 131072: {
       const match = type.value.match(/<(\d+)>$/);
       (0, import_node_assert7.default)(match);
       return {
-        op: 37,
+        op: 39,
         arg: parseInt(match[1], 10),
-        offset,
-        size: 1
+        offset
       };
     }
   }
@@ -21590,7 +21607,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
           }
           if (initType) {
             const bc = block.bytecodes[found - 1];
-            if (bc.op !== 46 && (!initInst || initInst.size > bc.size)) {
+            if (bc.op !== 46 && (!initInst || opcodeSize(initInst.op) > opcodeSize(bc.op))) {
               const { push, pop } = getOpInfo(bc);
               if (push === 1 && pop === 0) {
                 initInst = bc;
@@ -21624,7 +21641,6 @@ function optimizeArrayInit(func, block, index, context, interpState) {
       const bc = block.bytecodes[i2];
       const op = bc.op;
       bc.op = 2;
-      bc.size = 1;
       delete bc.arg;
       (0, import_node_assert8.default)(
         op === 17
@@ -21687,7 +21703,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
   } else {
     initInst = null;
   }
-  if (initLocal && (!initInst || initInst.size > initLocal.size)) {
+  if (initLocal && (!initInst || opcodeSize(initInst.op) > opcodeSize(initLocal.op))) {
     initInst = initLocal;
   }
   if (initInst) {
@@ -22278,7 +22294,6 @@ function minimizeLocals2(func, equivSets, context) {
             const argCount = bc;
             argCount.op = 53;
             argCount.arg = argc;
-            argCount.size = 2;
             filter = true;
           }
           break;
@@ -22299,7 +22314,6 @@ function minimizeLocals2(func, equivSets, context) {
             const nop = bc;
             nop.op = 0;
             delete nop.arg;
-            nop.size = 1;
             filter = true;
           }
           break;
@@ -22543,11 +22557,17 @@ function sizeBasedPRE2(func, context) {
         view.setFloat32(0, bc.arg);
         return BigInt(view.getInt32(0)) << 8n | BigInt(bc.op);
       }
+      case 37:
+      case 57:
+      case 58:
+        return BigInt(bc.arg) << 8n | BigInt(
+          37
+          /* ipush */
+        );
       case 39:
         if (bcs[index + 1]?.op === 48) {
           break;
         }
-      case 37:
       case 49:
       case 52:
       case 24:
@@ -22672,7 +22692,6 @@ function sizeBasedPRE2(func, context) {
             bc2.op = 0;
             prev.op = 18;
             prev.arg = slot;
-            prev.size = 2;
           }
         })
       );
@@ -22697,7 +22716,6 @@ function sizeBasedPRE2(func, context) {
       bcs.forEach((bc2) => {
         bc2.op = 18;
         bc2.arg = slot;
-        bc2.size = 2;
       });
     }
   });
@@ -22762,7 +22780,7 @@ function blockSharing(func, context) {
       blocks.forEach((block) => {
         const blockEnd = block.bytecodes[block.bytecodes.length - 1];
         if (!group.length) {
-          size = blockEnd.size;
+          size = opcodeSize(blockEnd.op);
         } else {
           const key = group[0];
           const keyEnd = key.bytecodes[key.bytecodes.length - 1];
@@ -22831,7 +22849,7 @@ function blockSharing(func, context) {
               }
               entry.group.delete(block);
             } else {
-              const sz = size2 + (bc?.size ?? 0);
+              const sz = size2 + (bc ? opcodeSize(bc.op) : 0);
               nextState.push({ group: blocks2.map((b) => group2[b]), size: sz });
             }
           });
@@ -23013,11 +23031,9 @@ function simpleOpts(func, context) {
             const dup = prev;
             dup.op = 46;
             dup.arg = 0;
-            dup.size = 2;
             const add = cur;
             add.op = 3;
             delete add.arg;
-            add.size = 1;
             logging3 && (0, import_chunk_SG7ODKRM.log)(`${func.name}: converting "ipush 1; shlv" to "dup 0; addv"`);
             continue;
           }
@@ -23034,7 +23050,6 @@ function simpleOpts(func, context) {
             changes = true;
             const mulv = cur;
             mulv.op = 5;
-            mulv.size = 1;
             delete mulv.arg;
           }
         }
@@ -23126,8 +23141,7 @@ function equalSymbolToEq(block, equalsIndex) {
   }
   block.bytecodes.splice(equalsIndex, 5, spush, {
     op: 26,
-    offset: invokem.offset,
-    size: 1
+    offset: invokem.offset
   });
   (0, import_chunk_SG7ODKRM.logger)(
     "optimize",
@@ -23211,7 +23225,7 @@ function removeUnreachableCatches(func, context) {
           }
           delete next.preds;
           removeBlock(func, next.offset);
-        } else if (next.next == null && next.bytecodes.length < 3 && next.bytecodes.reduce((size, bc) => size + bc.size, 0) < 3 && countFallthroughPreds(func, next) > 1) {
+        } else if (next.next == null && next.bytecodes.length < 3 && next.bytecodes.reduce((size, bc) => size + opcodeSize(bc.op), 0) < 3 && countFallthroughPreds(func, next) > 1) {
           (0, import_chunk_SG7ODKRM.logger)(
             "cfg",
             1,
@@ -23225,7 +23239,7 @@ function removeUnreachableCatches(func, context) {
           let offset = context.nextOffset;
           next.bytecodes.forEach((bc) => {
             block.bytecodes.push({ ...bc, offset });
-            offset += bc.size;
+            offset += opcodeSize(bc.op);
           });
           context.nextOffset = offset;
           redirect(func, block, next.offset, null);
@@ -23414,8 +23428,7 @@ function emitFunc(func, view, start, updateInfo, context) {
       const bc = {
         op: 25,
         arg: block.next,
-        offset: block.offset,
-        size: 3
+        offset: block.offset
       };
       offset = emitBytecode(bc, view, offset, linktable, shift_hack);
     }
@@ -24161,6 +24174,9 @@ function bytecodeToString(bytecode, symbolTable) {
   }
   return `${Opcodes[bytecode.op]}${arg ?? ""}`;
 }
+function offsetAfter(bc) {
+  return bc.offset + opcodeSize(bc.op);
+}
 function findFunctions({
   bytecodes,
   symbolTable,
@@ -24180,13 +24196,13 @@ function findFunctions({
       case 41:
       case 25:
       case 35:
-        blockStarts.add(bytecode.offset + bytecode.size);
+        blockStarts.add(offsetAfter(bytecode));
         blockStarts.add(bytecode.arg);
         return;
       case 22:
       case 23:
       case 51:
-        blockStarts.add(bytecode.offset + bytecode.size);
+        blockStarts.add(offsetAfter(bytecode));
         return;
     }
   });
@@ -24197,7 +24213,7 @@ function findFunctions({
   let next;
   let taken;
   bytecodes.forEach((bytecode, i) => {
-    const nextBcOffset = bytecode.offset + bytecode.size;
+    const nextBcOffset = offsetAfter(bytecode);
     next = nextBcOffset;
     taken = void 0;
     switch (bytecode.op) {
@@ -24327,7 +24343,6 @@ function findFunctions({
 function makeArgless(bc, op) {
   bc.op = op;
   delete bc.arg;
-  bc.size = 1;
 }
 function removeBlock(func, offset) {
   const block = func.blocks.get(offset);
@@ -28366,7 +28381,7 @@ async function launchSimulator(force = true) {
     for (let i = 0; ; i++) {
       if (await checkIfSimulatorRunning())
         return;
-      if (i === 10)
+      if (i === 25)
         return;
       await new Promise((r) => setTimeout(r, 200));
     }
@@ -28591,19 +28606,6 @@ async function generateOptimizedProject(options) {
   const pick_one = config.products ? config.products.indexOf("pick-one") : -1;
   if (pick_one >= 0) {
     let preferredProduct = 0;
-    targets.every((t, i) => {
-      const dev = devices[t.product];
-      if (!dev)
-        return true;
-      if (dev.ciqVersions.every((ciq) => ciq.startsWith("5"))) {
-        preferredProduct = i;
-        return false;
-      }
-      if (dev.ciqVersions.some((ciq) => ciq.startsWith("5"))) {
-        preferredProduct = i;
-      }
-      return true;
-    });
     options.products = [...options.products];
     options.products[pick_one] = targets[preferredProduct].product;
   }
@@ -28981,7 +28983,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_SG7ODKRM.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1712442631755 < opt_time) {
+      if (source_time < opt_time && 1713154555665 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29020,7 +29022,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.52",
+            optimizerVersion: "1.1.54",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -29517,7 +29519,7 @@ function optimizeProgramBuffer(filepath, view, debugXml, apiDebugXml, key, confi
     exceptionsMap,
     key,
     debugXml,
-    nextOffset: (bytecodes[bytecodes.length - 1]?.offset ?? 0) + (bytecodes[bytecodes.length - 1]?.size ?? 0),
+    nextOffset: bytecodes[bytecodes.length - 1] ? offsetAfter(bytecodes[bytecodes.length - 1]) : 0,
     nextLocalId: 0
   };
   optimizeBytecode(context);

package/build/optimizer.cjs

@@ -18,28 +18,28 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_J5XJWBYV.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_J5XJWBYV.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_5K64MLXC.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_5K64MLXC.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_J5XJWBYV.defaultConfig,
-  display: () => import_chunk_J5XJWBYV.display,
-  generateOneConfig: () => import_chunk_J5XJWBYV.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_J5XJWBYV.generateOptimizedProject,
-  getConfig: () => import_chunk_J5XJWBYV.getConfig,
-  getProjectAnalysis: () => import_chunk_J5XJWBYV.getProjectAnalysis,
-  get_jungle: () => import_chunk_J5XJWBYV.get_jungle,
-  isErrorWithLocation: () => import_chunk_J5XJWBYV.isErrorWithLocation,
-  launchSimulator: () => import_chunk_J5XJWBYV.launchSimulator,
-  manifestProducts: () => import_chunk_J5XJWBYV.manifestProducts,
-  mctree: () => import_chunk_J5XJWBYV.mctree,
-  simulateProgram: () => import_chunk_J5XJWBYV.simulateProgram
+  defaultConfig: () => import_chunk_5K64MLXC.defaultConfig,
+  display: () => import_chunk_5K64MLXC.display,
+  generateOneConfig: () => import_chunk_5K64MLXC.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_5K64MLXC.generateOptimizedProject,
+  getConfig: () => import_chunk_5K64MLXC.getConfig,
+  getProjectAnalysis: () => import_chunk_5K64MLXC.getProjectAnalysis,
+  get_jungle: () => import_chunk_5K64MLXC.get_jungle,
+  isErrorWithLocation: () => import_chunk_5K64MLXC.isErrorWithLocation,
+  launchSimulator: () => import_chunk_5K64MLXC.launchSimulator,
+  manifestProducts: () => import_chunk_5K64MLXC.manifestProducts,
+  mctree: () => import_chunk_5K64MLXC.mctree,
+  simulateProgram: () => import_chunk_5K64MLXC.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_J5XJWBYV = require("./chunk-J5XJWBYV.cjs");
+var import_chunk_5K64MLXC = require("./chunk-5K64MLXC.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_J5XJWBYV.init_optimizer)();
+(0, import_chunk_5K64MLXC.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_J5XJWBYV.SectionKinds,
-  appSupport: () => import_chunk_J5XJWBYV.appSupport,
-  connectiq: () => import_chunk_J5XJWBYV.connectiq,
-  getDeviceInfo: () => import_chunk_J5XJWBYV.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_J5XJWBYV.getFunctionDocumentation,
-  getLanguages: () => import_chunk_J5XJWBYV.getLanguages,
-  getSdkPath: () => import_chunk_J5XJWBYV.getSdkPath,
-  isWin: () => import_chunk_J5XJWBYV.isWin,
-  optimizeProgram: () => import_chunk_J5XJWBYV.optimizeProgram,
-  readPrg: () => import_chunk_J5XJWBYV.readPrg,
-  readPrgWithOffsets: () => import_chunk_J5XJWBYV.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_J5XJWBYV.xml_util_exports
+  SectionKinds: () => import_chunk_5K64MLXC.SectionKinds,
+  appSupport: () => import_chunk_5K64MLXC.appSupport,
+  connectiq: () => import_chunk_5K64MLXC.connectiq,
+  getDeviceInfo: () => import_chunk_5K64MLXC.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_5K64MLXC.getFunctionDocumentation,
+  getLanguages: () => import_chunk_5K64MLXC.getLanguages,
+  getSdkPath: () => import_chunk_5K64MLXC.getSdkPath,
+  isWin: () => import_chunk_5K64MLXC.isWin,
+  optimizeProgram: () => import_chunk_5K64MLXC.optimizeProgram,
+  readPrg: () => import_chunk_5K64MLXC.readPrg,
+  readPrgWithOffsets: () => import_chunk_5K64MLXC.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_5K64MLXC.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_J5XJWBYV = require("./chunk-J5XJWBYV.cjs");
+var import_chunk_5K64MLXC = require("./chunk-5K64MLXC.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_J5XJWBYV.init_sdk_util)();
+(0, import_chunk_5K64MLXC.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/inliner.d.ts

@@ -1,12 +1,12 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-import { FunctionStateNode, ProgramStateAnalysis } from "./optimizer-types";
+import { Diagnostic, FunctionStateNode, ProgramStateAnalysis } from "./optimizer-types";
 export declare function inlinableSubExpression(expr: mctree.Expression): mctree.SimpleCallExpression | null;
 export declare function inlineRequested(state: ProgramStateAnalysis, func: FunctionStateNode): boolean;
 export declare function shouldInline(state: ProgramStateAnalysis, func: FunctionStateNode, call: mctree.CallExpression, context: InlineContext | null): boolean;
 type InlineBody = mctree.BlockStatement | mctree.ExpressionStatement["expression"];
 export declare function unused(state: ProgramStateAnalysis, expression: mctree.ExpressionStatement["expression"]): mctree.Statement[];
 export declare function unused(state: ProgramStateAnalysis, expression: mctree.ExpressionStatement["expression"], top: true): mctree.Statement[] | null;
-export declare function inlineDiagnostic(state: ProgramStateAnalysis, func: FunctionStateNode, call: mctree.CallExpression, message: string | null): void;
+export declare function inlineDiagnostic(state: ProgramStateAnalysis, func: FunctionStateNode, call: mctree.CallExpression, message: string | null, extra?: Diagnostic["extra"]): void;
 export type InlineContext = mctree.ReturnStatement | mctree.IfStatement | mctree.AssignmentExpression | mctree.ExpressionStatement | mctree.VariableDeclarator;
 export declare function inlineFunction(state: ProgramStateAnalysis, func: FunctionStateNode, call: mctree.CallExpression, context: InlineContext | null): InlineBody | null;
 export declare function applyTypeIfNeeded(node: mctree.Node): mctree.Node;

package/build/src/optimizer-types.d.ts

@@ -1,5 +1,4 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-import { EnumStringMember } from "@markw65/prettier-plugin-monkeyc/build/estree-types";
 import { xmlUtil } from "./sdk-util";
 import { ExactOrUnion } from "./type-flow/types";
 export type DiagnosticType = "ERROR" | "WARNING" | "INFO";
@@ -228,7 +227,7 @@ export type ProgramState = {
     };
     diagnostics?: Record<string, PreDiagnostic[]>;
     inlineDiagnostics?: Record<string, Diagnostic[]>;
-    enumMap?: Map<EnumStringMember, EnumStateNode>;
+    enumMap?: Map<mctree.EnumStringMember, EnumStateNode>;
 };
 export type Finalized<T, Keys extends keyof T> = T & {
     [key in Keys]-?: NonNullable<T[key]>;

package/build/src/readprg/bytecode.d.ts

@@ -62,6 +62,7 @@ export declare function functionToString(func: FuncEntry, context: Context | nul
 export declare function blockToString(block: Block, context: Context | null): string;
 export declare function lineInfoToString(lineInfo: LineNumber, context: Context | null): string;
 export declare function bytecodeToString(bytecode: Bytecode, symbolTable: SymbolTable | null | undefined): string;
+export declare function offsetAfter(bc: Bytecode): number;
 export declare function findFunctions({ bytecodes, symbolTable, exceptionsMap, }: Context): Map<number, FuncEntry>;
 export declare function makeArgless(bc: Bytecode, op: Opcodes): void;
 export declare function equalBlocks(b1: Block, b2: Block): boolean;

package/build/src/readprg/opcodes.d.ts

@@ -80,7 +80,6 @@ export declare enum Opcodes {
 interface BaseOpcode {
     op: Opcodes;
     offset: number;
-    size: number;
     lineNum?: LineNumber;
     arg?: unknown;
 }

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_J5XJWBYV = require("./chunk-J5XJWBYV.cjs");
+var import_chunk_5K64MLXC = require("./chunk-5K64MLXC.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.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_J5XJWBYV.init_worker_task)();
+    (0, import_chunk_5K64MLXC.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_J5XJWBYV.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_5K64MLXC.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.52",
+  "version": "1.1.54",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -52,7 +52,7 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.55"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.56"
   },
   "devDependencies": {
     "@markw65/peggy-optimizer": "^1.0.1",