npm - @markw65/monkeyc-optimizer - Versions diffs - 1.1.22 → 1.1.24 - Mend

@markw65/monkeyc-optimizer 1.1.22 → 1.1.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/README.md +19 -0
package/build/api.cjs +34 -34
package/build/{chunk-563GVBVT.cjs → chunk-3HVXWNU4.cjs} +1435 -452
package/build/{chunk-HHQDDCTP.cjs → chunk-QFQPBQSO.cjs} +4 -4
package/build/optimizer.cjs +19 -19
package/build/sdk-util.cjs +15 -15
package/build/src/optimizer-types.d.ts +1 -0
package/build/src/readprg/bytecode.d.ts +3 -1
package/build/src/readprg/cflow.d.ts +2 -1
package/build/src/readprg/emit.d.ts +10 -1
package/build/src/readprg/interp.d.ts +1 -0
package/build/src/readprg/opcodes.d.ts +18 -2
package/build/src/readprg/pre.d.ts +2 -0
package/build/src/readprg/symbols.d.ts +1 -0
package/build/src/type-flow/interp.d.ts +1 -0
package/build/util.cjs +24 -24
package/build/worker-thread.cjs +5 -5
package/package.json +1 -1

package/build/{chunk-563GVBVT.cjs → chunk-3HVXWNU4.cjs} RENAMED Viewed

@@ -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_563GVBVT_exports = {};
-__export(chunk_563GVBVT_exports, {
+var chunk_3HVXWNU4_exports = {};
+__export(chunk_3HVXWNU4_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -125,8 +125,8 @@ __export(chunk_563GVBVT_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_563GVBVT_exports);
-var import_chunk_HHQDDCTP = require("./chunk-HHQDDCTP.cjs");
+module.exports = __toCommonJS(chunk_3HVXWNU4_exports);
+var import_chunk_QFQPBQSO = require("./chunk-QFQPBQSO.cjs");
 var import_prettier_plugin_monkeyc = require("@markw65/prettier-plugin-monkeyc");
 var import_node_assert = __toESM(require("node:assert"));
 var import_prettier_plugin_monkeyc2 = require("@markw65/prettier-plugin-monkeyc");
@@ -148,8 +148,10 @@ var import_node_assert10 = __toESM(require("node:assert"));
 var import_node_assert11 = __toESM(require("node:assert"));
 var import_node_assert12 = __toESM(require("node:assert"));
 var import_node_assert13 = __toESM(require("node:assert"));
-var fs3 = __toESM(require("fs/promises"));
 var import_node_assert14 = __toESM(require("node:assert"));
+var import_node_assert15 = __toESM(require("node:assert"));
+var fs3 = __toESM(require("fs/promises"));
+var import_node_assert16 = __toESM(require("node:assert"));
 var crypto = __toESM(require("node:crypto"));
 var path = __toESM(require("path"));
 var fs4 = __toESM(require("fs/promises"));
@@ -5121,7 +5123,7 @@ function peg$parse(input, options) {
     );
   }
 }
-var init_xml = (0, import_chunk_HHQDDCTP.__esm)({
+var init_xml = (0, import_chunk_QFQPBQSO.__esm)({
   "src/xml.peggy"() {
     "use strict";
     peg$subclass(peg$SyntaxError, Error);
@@ -5466,7 +5468,7 @@ function getLiteralNode(node) {
   return null;
 }
 var mctreeTypeInfo;
-var init_ast = (0, import_chunk_HHQDDCTP.__esm)({
+var init_ast = (0, import_chunk_QFQPBQSO.__esm)({
   "src/ast.ts"() {
     "use strict";
     mctreeTypeInfo = {
@@ -5536,7 +5538,7 @@ var init_ast = (0, import_chunk_HHQDDCTP.__esm)({
   }
 });
 var xml_util_exports = {};
-(0, import_chunk_HHQDDCTP.__export)(xml_util_exports, {
+(0, import_chunk_QFQPBQSO.__export)(xml_util_exports, {
   Document: () => Document,
   Nodes: () => Nodes,
   PeggyError: () => PeggyError,
@@ -5669,7 +5671,7 @@ function visit_xml(contents, visitor) {
   });
 }
 var PeggyError, entities, Document, Nodes;
-var init_xml_util = (0, import_chunk_HHQDDCTP.__esm)({
+var init_xml_util = (0, import_chunk_QFQPBQSO.__esm)({
   "src/xml-util.ts"() {
     "use strict";
     init_xml();
@@ -5839,7 +5841,7 @@ var init_xml_util = (0, import_chunk_HHQDDCTP.__esm)({
     };
   }
 });
-var require_pend = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_pend = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/pend/index.js"(exports, module2) {
     module2.exports = Pend;
     function Pend() {
@@ -5893,16 +5895,16 @@ var require_pend = (0, import_chunk_HHQDDCTP.__commonJS)({
     }
   }
 });
-var require_fd_slicer = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_fd_slicer = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/fd-slicer/index.js"(exports) {
-    var fs9 = (0, import_chunk_HHQDDCTP.__require)("fs");
-    var util = (0, import_chunk_HHQDDCTP.__require)("util");
-    var stream = (0, import_chunk_HHQDDCTP.__require)("stream");
+    var fs9 = (0, import_chunk_QFQPBQSO.__require)("fs");
+    var util = (0, import_chunk_QFQPBQSO.__require)("util");
+    var stream = (0, import_chunk_QFQPBQSO.__require)("stream");
     var Readable = stream.Readable;
     var Writable = stream.Writable;
     var PassThrough = stream.PassThrough;
     var Pend = require_pend();
-    var EventEmitter2 = (0, import_chunk_HHQDDCTP.__require)("events").EventEmitter;
+    var EventEmitter2 = (0, import_chunk_QFQPBQSO.__require)("events").EventEmitter;
     exports.createFromBuffer = createFromBuffer;
     exports.createFromFd = createFromFd;
     exports.BufferSlicer = BufferSlicer;
@@ -6159,9 +6161,9 @@ var require_fd_slicer = (0, import_chunk_HHQDDCTP.__commonJS)({
     }
   }
 });
-var require_buffer_crc32 = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_buffer_crc32 = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/buffer-crc32/index.js"(exports, module2) {
-    var Buffer2 = (0, import_chunk_HHQDDCTP.__require)("buffer").Buffer;
+    var Buffer2 = (0, import_chunk_QFQPBQSO.__require)("buffer").Buffer;
     var CRC_TABLE = [
       0,
       1996959894,
@@ -6464,17 +6466,17 @@ var require_buffer_crc32 = (0, import_chunk_HHQDDCTP.__commonJS)({
     module2.exports = crc32;
   }
 });
-var require_yauzl = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_yauzl = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/yauzl/index.js"(exports) {
-    var fs9 = (0, import_chunk_HHQDDCTP.__require)("fs");
-    var zlib = (0, import_chunk_HHQDDCTP.__require)("zlib");
+    var fs9 = (0, import_chunk_QFQPBQSO.__require)("fs");
+    var zlib = (0, import_chunk_QFQPBQSO.__require)("zlib");
     var fd_slicer = require_fd_slicer();
     var crc32 = require_buffer_crc32();
-    var util = (0, import_chunk_HHQDDCTP.__require)("util");
-    var EventEmitter2 = (0, import_chunk_HHQDDCTP.__require)("events").EventEmitter;
-    var Transform = (0, import_chunk_HHQDDCTP.__require)("stream").Transform;
-    var PassThrough = (0, import_chunk_HHQDDCTP.__require)("stream").PassThrough;
-    var Writable = (0, import_chunk_HHQDDCTP.__require)("stream").Writable;
+    var util = (0, import_chunk_QFQPBQSO.__require)("util");
+    var EventEmitter2 = (0, import_chunk_QFQPBQSO.__require)("events").EventEmitter;
+    var Transform = (0, import_chunk_QFQPBQSO.__require)("stream").Transform;
+    var PassThrough = (0, import_chunk_QFQPBQSO.__require)("stream").PassThrough;
+    var Writable = (0, import_chunk_QFQPBQSO.__require)("stream").Writable;
     exports.open = open2;
     exports.fromFd = fromFd;
     exports.fromBuffer = fromBuffer;
@@ -7163,14 +7165,14 @@ var require_yauzl = (0, import_chunk_HHQDDCTP.__commonJS)({
     }
   }
 });
-var require_yazl = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_yazl = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/yazl/index.js"(exports) {
-    var fs9 = (0, import_chunk_HHQDDCTP.__require)("fs");
-    var Transform = (0, import_chunk_HHQDDCTP.__require)("stream").Transform;
-    var PassThrough = (0, import_chunk_HHQDDCTP.__require)("stream").PassThrough;
-    var zlib = (0, import_chunk_HHQDDCTP.__require)("zlib");
-    var util = (0, import_chunk_HHQDDCTP.__require)("util");
-    var EventEmitter2 = (0, import_chunk_HHQDDCTP.__require)("events").EventEmitter;
+    var fs9 = (0, import_chunk_QFQPBQSO.__require)("fs");
+    var Transform = (0, import_chunk_QFQPBQSO.__require)("stream").Transform;
+    var PassThrough = (0, import_chunk_QFQPBQSO.__require)("stream").PassThrough;
+    var zlib = (0, import_chunk_QFQPBQSO.__require)("zlib");
+    var util = (0, import_chunk_QFQPBQSO.__require)("util");
+    var EventEmitter2 = (0, import_chunk_QFQPBQSO.__require)("events").EventEmitter;
     var crc32 = require_buffer_crc32();
     exports.ZipFile = ZipFile2;
     exports.dateToDosDateTime = dateToDosDateTime;
@@ -7827,7 +7829,7 @@ function skipClassDef(view, current, symbols) {
         const offset = symbols.symbolToLabelMap.get(f1 >>> 8);
         label = offset != null && symbols.symbols.get(offset)?.str || `method_${pc}`;
       }
-      symbols.methods.set(pc, { name: label, id: f1 >>> 8 });
+      symbols.methods.set(pc, { name: label, id: f1 >>> 8, argc: null });
     }
   }
   return current;
@@ -7872,7 +7874,7 @@ function fixupClassDef(view, current, offsetMap) {
   }
   return current;
 }
-var init_data = (0, import_chunk_HHQDDCTP.__esm)({
+var init_data = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/data.ts"() {
     "use strict";
     init_bytecode();
@@ -8015,7 +8017,7 @@ function findCalleesByNode(state, callee) {
     return null;
   return hasProperty(state.allFunctions, name) && state.allFunctions[name] || null;
 }
-var init_function_info = (0, import_chunk_HHQDDCTP.__esm)({
+var init_function_info = (0, import_chunk_QFQPBQSO.__esm)({
   "src/function-info.ts"() {
     "use strict";
     init_ast();
@@ -8077,7 +8079,7 @@ function renameVariable(state, locals, declName2) {
   map2[name] = true;
   return name;
 }
-var init_variable_renamer = (0, import_chunk_HHQDDCTP.__esm)({
+var init_variable_renamer = (0, import_chunk_QFQPBQSO.__esm)({
   "src/variable-renamer.ts"() {
     "use strict";
     init_api();
@@ -8910,7 +8912,7 @@ function fixNodeScope(state, lookupNode, nodeStack) {
   }
   return null;
 }
-var init_inliner = (0, import_chunk_HHQDDCTP.__esm)({
+var init_inliner = (0, import_chunk_QFQPBQSO.__esm)({
   "src/inliner.ts"() {
     "use strict";
     init_api();
@@ -8920,7 +8922,7 @@ var init_inliner = (0, import_chunk_HHQDDCTP.__esm)({
   }
 });
 var StateNodeAttributes;
-var init_optimizer_types = (0, import_chunk_HHQDDCTP.__esm)({
+var init_optimizer_types = (0, import_chunk_QFQPBQSO.__esm)({
   "src/optimizer-types.ts"() {
     "use strict";
     StateNodeAttributes = /* @__PURE__ */ ((StateNodeAttributes2) => {
@@ -9066,7 +9068,7 @@ function pragmaChecker(state, ast, diagnostics) {
     return null;
   });
 }
-var init_pragma_checker = (0, import_chunk_HHQDDCTP.__esm)({
+var init_pragma_checker = (0, import_chunk_QFQPBQSO.__esm)({
   "src/pragma-checker.ts"() {
     "use strict";
     init_api();
@@ -9427,9 +9429,9 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
             );
           }
         } else {
-          (0, import_chunk_HHQDDCTP.forEach)(events, (e) => e.mayThrow = false);
+          (0, import_chunk_QFQPBQSO.forEach)(events, (e) => e.mayThrow = false);
         }
-        (0, import_chunk_HHQDDCTP.forEach)(events, (event) => {
+        (0, import_chunk_QFQPBQSO.forEach)(events, (event) => {
           if (event.mayThrow) {
             for (let i = localState.stack.length; i--; ) {
               const target = localState.stack[i].throw;
@@ -9570,11 +9572,11 @@ function getPostOrder(head) {
   return blocks;
 }
 var Terminals, LocalState;
-var init_control_flow = (0, import_chunk_HHQDDCTP.__esm)({
+var init_control_flow = (0, import_chunk_QFQPBQSO.__esm)({
   "src/control-flow.ts"() {
     "use strict";
     init_ast();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     Terminals = {
       BreakStatement: "break",
       ContinueStatement: "continue",
@@ -9604,12 +9606,12 @@ var init_control_flow = (0, import_chunk_HHQDDCTP.__esm)({
         if (!from.succs) {
           from.succs = [to];
         } else {
-          (0, import_chunk_HHQDDCTP.pushUnique)(from.succs, to);
+          (0, import_chunk_QFQPBQSO.pushUnique)(from.succs, to);
         }
         if (!to.preds) {
           to.preds = [from];
         } else {
-          (0, import_chunk_HHQDDCTP.pushUnique)(to.preds, from);
+          (0, import_chunk_QFQPBQSO.pushUnique)(to.preds, from);
         }
       }
       newBlock(block) {
@@ -9882,8 +9884,8 @@ function mergeObjectValues(to, from) {
 function mergeStateDecls(to, from) {
   let changed = false;
   let result = to;
-  (0, import_chunk_HHQDDCTP.forEach)(from, (v) => {
-    if ((0, import_chunk_HHQDDCTP.some)(to, (t) => t === v)) {
+  (0, import_chunk_QFQPBQSO.forEach)(from, (v) => {
+    if ((0, import_chunk_QFQPBQSO.some)(to, (t) => t === v)) {
       return;
     }
     if (Array.isArray(result)) {
@@ -10009,12 +10011,12 @@ function widenTypeHelper(t, depth) {
 function widenType(t) {
   return widenTypeHelper(t, 0);
 }
-var init_union_type = (0, import_chunk_HHQDDCTP.__esm)({
+var init_union_type = (0, import_chunk_QFQPBQSO.__esm)({
   "src/type-flow/union-type.ts"() {
     "use strict";
     init_ast();
     init_data_flow();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_intersection_type();
     init_sub_type();
     init_types();
@@ -10028,7 +10030,7 @@ function expandTypedef(t) {
   );
   const tExpanded = cloneType(t);
   clearValuesUnder(tExpanded, 262144, true);
-  (0, import_chunk_HHQDDCTP.forEach)(decls, (decl) => unionInto(tExpanded, decl.resolvedType));
+  (0, import_chunk_QFQPBQSO.forEach)(decls, (decl) => unionInto(tExpanded, decl.resolvedType));
   return tExpanded;
 }
 function intersectEnum(t, e) {
@@ -10180,9 +10182,9 @@ function intersectionValue(pair) {
     case 4096:
     case 8192: {
       const common = [];
-      (0, import_chunk_HHQDDCTP.forEach)(
+      (0, import_chunk_QFQPBQSO.forEach)(
         pair.avalue,
-        (sna) => (0, import_chunk_HHQDDCTP.some)(pair.bvalue, (snb) => sna === snb) && common.push(sna)
+        (sna) => (0, import_chunk_QFQPBQSO.some)(pair.bvalue, (snb) => sna === snb) && common.push(sna)
       );
       if (!common.length)
         return null;
@@ -10190,9 +10192,9 @@ function intersectionValue(pair) {
     }
     case 16384: {
       const common = [];
-      (0, import_chunk_HHQDDCTP.forEach)(pair.avalue, (sna) => {
+      (0, import_chunk_QFQPBQSO.forEach)(pair.avalue, (sna) => {
         const superA = getSuperClasses(sna);
-        (0, import_chunk_HHQDDCTP.forEach)(pair.bvalue, (snb) => {
+        (0, import_chunk_QFQPBQSO.forEach)(pair.bvalue, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             common.push(sna);
           }
@@ -10413,7 +10415,7 @@ function restrictExactTypesByEquality(a, b) {
     }
     case 262144:
       return restrictByEquality(
-        (0, import_chunk_HHQDDCTP.reduce)(
+        (0, import_chunk_QFQPBQSO.reduce)(
           a.value,
           (cur, decl) => {
             unionInto(cur, decl.resolvedType);
@@ -10475,12 +10477,12 @@ function restrictByEquality(a, b) {
   }
   return restrictByEqualityByComponent(a, b);
 }
-var init_intersection_type = (0, import_chunk_HHQDDCTP.__esm)({
+var init_intersection_type = (0, import_chunk_QFQPBQSO.__esm)({
   "src/type-flow/intersection-type.ts"() {
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_could_be();
     init_interp();
     init_types();
@@ -10566,14 +10568,14 @@ function subtypeOfValue(pair) {
     case 8192: {
       const asd = pair.avalue;
       const bsd = pair.bvalue;
-      return (0, import_chunk_HHQDDCTP.some)(asd, (sna) => (0, import_chunk_HHQDDCTP.some)(bsd, (snb) => sna === snb));
+      return (0, import_chunk_QFQPBQSO.some)(asd, (sna) => (0, import_chunk_QFQPBQSO.some)(bsd, (snb) => sna === snb));
     }
     case 16384: {
       const asd = pair.avalue;
       const bsd = pair.bvalue;
-      return (0, import_chunk_HHQDDCTP.every)(asd, (sna) => {
+      return (0, import_chunk_QFQPBQSO.every)(asd, (sna) => {
         const superA = getSuperClasses(sna);
-        return (0, import_chunk_HHQDDCTP.some)(bsd, (snb) => {
+        return (0, import_chunk_QFQPBQSO.some)(bsd, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             return true;
           }
@@ -10604,12 +10606,12 @@ function subtypeOfObj(a, b) {
     return subtypeOf(a[key], value2);
   });
 }
-var init_sub_type = (0, import_chunk_HHQDDCTP.__esm)({
+var init_sub_type = (0, import_chunk_QFQPBQSO.__esm)({
   "src/type-flow/sub-type.ts"() {
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_intersection_type();
     init_types();
     init_union_type();
@@ -10942,7 +10944,7 @@ function evaluateLogicalTypes(op, left, right) {
   }
 }
 var operators;
-var init_interp_binary = (0, import_chunk_HHQDDCTP.__esm)({
+var init_interp_binary = (0, import_chunk_QFQPBQSO.__esm)({
   "src/type-flow/interp-binary.ts"() {
     "use strict";
     init_could_be();
@@ -10957,13 +10959,13 @@ function isTypeStateKey(decl) {
   return Array.isArray(decl) || decl.type !== "MemberDecl" && decl.type !== "Unknown";
 }
 function declIsLocal(decl) {
-  return (0, import_chunk_HHQDDCTP.some)(
+  return (0, import_chunk_QFQPBQSO.some)(
     decl,
     (d) => d.type === "BinaryExpression" || d.type === "Identifier" || d.type === "VariableDeclarator" && isLocal(d)
   );
 }
 function declIsNonLocal(decl) {
-  return (0, import_chunk_HHQDDCTP.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d));
+  return (0, import_chunk_QFQPBQSO.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d));
 }
 function localDeclName(decl) {
   if (Array.isArray(decl))
@@ -10979,7 +10981,7 @@ function localDeclName(decl) {
   throw new Error(`Invalid local decl: ${declFullName(decl)}`);
 }
 function tsKey(key) {
-  return `${(0, import_chunk_HHQDDCTP.map)(key, (k) => {
+  return `${(0, import_chunk_QFQPBQSO.map)(key, (k) => {
     if (k.type === "Literal") {
       return k.raw;
     } else if (isStateNode(k)) {
@@ -11011,7 +11013,7 @@ function describeEvent(event) {
 }
 function printBlockEvents(block, extra) {
   console.log("Events:");
-  (0, import_chunk_HHQDDCTP.forEach)(
+  (0, import_chunk_QFQPBQSO.forEach)(
     block.events,
     (event) => console.log(`    ${describeEvent(event)} ${extra ? extra(event) : ""}`)
   );
@@ -11128,12 +11130,12 @@ function resolveDottedMember(istate, object, next) {
   const mayThrow2 = !subtypeOf(object, type);
   return { mayThrow: mayThrow2, object: type, property };
 }
-var init_type_flow_util = (0, import_chunk_HHQDDCTP.__esm)({
+var init_type_flow_util = (0, import_chunk_QFQPBQSO.__esm)({
   "src/type-flow/type-flow-util.ts"() {
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_intersection_type();
     init_sub_type();
     init_types();
@@ -11185,7 +11187,7 @@ function calleeObjectType(istate, callee) {
 }
 function checkCallArgs(istate, node, callees, args) {
   const allDiags = [];
-  const resultType = (0, import_chunk_HHQDDCTP.reduce)(
+  const resultType = (0, import_chunk_QFQPBQSO.reduce)(
     callees,
     (result, cur) => {
       const curDiags = [];
@@ -11334,7 +11336,7 @@ function isOverride(cur, funcs) {
   const cls = cur.stack?.[cur.stack.length - 1]?.sn;
   if (cls?.type === "ClassDeclaration" && cls.superClasses) {
     const supers = getSuperClasses(cls);
-    if (supers && (0, import_chunk_HHQDDCTP.some)(funcs, (func) => {
+    if (supers && (0, import_chunk_QFQPBQSO.some)(funcs, (func) => {
       if (func === cur)
         return false;
       const fcls = func.stack?.[func.stack.length - 1].sn;
@@ -11720,12 +11722,12 @@ function expandKeys(state, table) {
   return result;
 }
 var systemCallInfo, systemCallVersion;
-var init_interp_call = (0, import_chunk_HHQDDCTP.__esm)({
+var init_interp_call = (0, import_chunk_QFQPBQSO.__esm)({
   "src/type-flow/interp-call.ts"() {
     "use strict";
     init_optimizer_types();
     init_api();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_interp();
     init_sub_type();
     init_types();
@@ -12628,7 +12630,7 @@ function mustBeIdentical(a, b) {
   }
   return false;
 }
-var init_interp = (0, import_chunk_HHQDDCTP.__esm)({
+var init_interp = (0, import_chunk_QFQPBQSO.__esm)({
   "src/type-flow/interp.ts"() {
     "use strict";
     init_api();
@@ -12847,7 +12849,7 @@ function typeFromTypeStateNode(state, sn, classVsObj) {
           );
           if (value2) {
             const a = [];
-            (0, import_chunk_HHQDDCTP.forEach)(value2, (v) => {
+            (0, import_chunk_QFQPBQSO.forEach)(value2, (v) => {
               if (v !== sn)
                 a.push(v);
             });
@@ -13222,7 +13224,7 @@ function mustBeFalse(arg) {
   return arg.type === 1 || arg.type === 2 || (arg.type === 8 || arg.type === 16) && arg.value != null && Number(arg.value) === 0;
 }
 function display(type) {
-  const names = (v, fn) => (0, import_chunk_HHQDDCTP.map)(v, fn).sort().filter((s, i, arr) => !i || s !== arr[i - 1]).join(" or ");
+  const names = (v, fn) => (0, import_chunk_QFQPBQSO.map)(v, fn).sort().filter((s, i, arr) => !i || s !== arr[i - 1]).join(" or ");
   const parts = [];
   const displayOne = (tv) => {
     switch (tv.type) {
@@ -13413,13 +13415,13 @@ function getStateNodeDeclsFromType(state, object) {
   return decls;
 }
 var LastTypeTag, SingletonTypeTagsConst, UnionDataTypeTagsConst, ValueTypeTagsConst, ObjectLikeTagsConst, EnumTagsConst, TruthyTypes;
-var init_types = (0, import_chunk_HHQDDCTP.__esm)({
+var init_types = (0, import_chunk_QFQPBQSO.__esm)({
   "src/type-flow/types.ts"() {
     "use strict";
     init_data_flow();
     init_api();
     init_ast();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_interp();
     init_union_type();
     init_intersection_type();
@@ -13475,7 +13477,7 @@ function couldBeHelper(a, b, shallow) {
       262144
       /* Typedef */
     );
-    return typedef && (0, import_chunk_HHQDDCTP.some)(typedef, (td) => {
+    return typedef && (0, import_chunk_QFQPBQSO.some)(typedef, (td) => {
       if (!td.resolvedType) {
         throw new Error(`No resolved type for ${td.fullName} in 'couldBe'`);
       }
@@ -13526,15 +13528,15 @@ function couldBeValue(pair, shallow) {
     }
     case 4096:
     case 8192: {
-      return (0, import_chunk_HHQDDCTP.some)(
+      return (0, import_chunk_QFQPBQSO.some)(
         pair.avalue,
-        (sna) => (0, import_chunk_HHQDDCTP.some)(pair.bvalue, (snb) => sna === snb)
+        (sna) => (0, import_chunk_QFQPBQSO.some)(pair.bvalue, (snb) => sna === snb)
       );
     }
     case 16384: {
-      return (0, import_chunk_HHQDDCTP.some)(pair.avalue, (sna) => {
+      return (0, import_chunk_QFQPBQSO.some)(pair.avalue, (sna) => {
         const superA = getSuperClasses(sna);
-        return (0, import_chunk_HHQDDCTP.some)(pair.bvalue, (snb) => {
+        return (0, import_chunk_QFQPBQSO.some)(pair.bvalue, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             return true;
           }
@@ -13562,12 +13564,12 @@ function couldBeObj(a, b) {
     return couldBe(value2, b[key]);
   });
 }
-var init_could_be = (0, import_chunk_HHQDDCTP.__esm)({
+var init_could_be = (0, import_chunk_QFQPBQSO.__esm)({
   "src/type-flow/could-be.ts"() {
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_types();
   }
 });
@@ -13888,7 +13890,7 @@ function eliminateDeadStores(state, func, graph, logThisRun) {
   });
   return { copyPropStores, changes };
 }
-var init_dead_store = (0, import_chunk_HHQDDCTP.__esm)({
+var init_dead_store = (0, import_chunk_QFQPBQSO.__esm)({
   "src/type-flow/dead-store.ts"() {
     "use strict";
     init_api();
@@ -14484,7 +14486,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       }
       if (selfClassDecl) {
         const baseObj = getObjectValue(baseElem.type);
-        if (baseObj && baseObj.klass.type === 16384 && (0, import_chunk_HHQDDCTP.some)(
+        if (baseObj && baseObj.klass.type === 16384 && (0, import_chunk_QFQPBQSO.some)(
           baseObj.klass.value,
           (cls) => cls === selfClassDecl || getSuperClasses(cls)?.has(selfClassDecl) || getSuperClasses(selfClassDecl)?.has(cls) || false
         )) {
@@ -14529,7 +14531,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     return [next, updateAny];
   }
   function typeConstraint(decls) {
-    return (0, import_chunk_HHQDDCTP.reduce)(
+    return (0, import_chunk_QFQPBQSO.reduce)(
       decls,
       (cur, decl) => {
         if (decl.type === "Identifier" || decl.type === "BinaryExpression") {
@@ -14622,9 +14624,9 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     stack: [],
     func
   };
-  const modifiableDecl = (decls, callees) => (0, import_chunk_HHQDDCTP.some)(
+  const modifiableDecl = (decls, callees) => (0, import_chunk_QFQPBQSO.some)(
     decls,
-    (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl) && (!callees || (0, import_chunk_HHQDDCTP.some)(callees, (callee) => functionMayModify(state, callee, decl)))
+    (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl) && (!callees || (0, import_chunk_QFQPBQSO.some)(callees, (callee) => functionMayModify(state, callee, decl)))
   );
   const mergeSuccState = (top, curState) => {
     top.succs?.forEach((succ) => {
@@ -14645,7 +14647,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       type: 0
       /* Never */
     };
-    const result = (0, import_chunk_HHQDDCTP.every)(callees, (callee) => {
+    const result = (0, import_chunk_QFQPBQSO.every)(callees, (callee) => {
       const info = sysCallInfo(istate.state, callee);
       if (!info)
         return false;
@@ -15045,7 +15047,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
               );
             }
           }
-          if (nodeCopyProp.size && event.node.type === "CallExpression" && (0, import_chunk_HHQDDCTP.some)(callees, (callee) => inlineRequested(state, callee))) {
+          if (nodeCopyProp.size && event.node.type === "CallExpression" && (0, import_chunk_QFQPBQSO.some)(callees, (callee) => inlineRequested(state, callee))) {
             event.node.arguments.forEach((arg) => {
               const def = nodeCopyProp.get(arg);
               if (def && nodeCopyProp.get(def) !== false) {
@@ -15057,7 +15059,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           let calleeEffects;
           curState.map.forEach((tsv, decl) => {
             let type = tsv.curType;
-            if ((type.value == null || !(type.type & (32768 | 512 | 1024))) && !(0, import_chunk_HHQDDCTP.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d))) {
+            if ((type.value == null || !(type.type & (32768 | 512 | 1024))) && !(0, import_chunk_QFQPBQSO.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d))) {
               return;
             }
             if (modifiableDecl(decl, callees)) {
@@ -15070,7 +15072,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
               (0, import_node_assert3.default)(!tsv.copyPropItem);
               clearRelatedCopyPropEvents(curState, decl, nodeCopyProp);
               curState.map.set(decl, { curType: typeConstraint(decl) });
-            } else if (type.type & (32768 | 512 | 1024) && (calleeEffects == null ? calleeEffects = !callees || !(0, import_chunk_HHQDDCTP.every)(callees, (callee) => callee.info === false) : calleeEffects)) {
+            } else if (type.type & (32768 | 512 | 1024) && (calleeEffects == null ? calleeEffects = !callees || !(0, import_chunk_QFQPBQSO.every)(callees, (callee) => callee.info === false) : calleeEffects)) {
               if (type.value != null && type.type & 32768) {
                 const odata = getObjectValue(tsv.curType);
                 if (odata?.obj) {
@@ -15118,7 +15120,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           2
           /* Reassign */
         );
-        (0, import_chunk_HHQDDCTP.some)(event.decl, (decl) => {
+        (0, import_chunk_QFQPBQSO.some)(event.decl, (decl) => {
           if (decl.type !== "VariableDeclarator" || decl.node.kind !== "var" || !isClassVariable(decl)) {
             return false;
           }
@@ -15126,7 +15128,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           if (affected) {
             const objType = typeFromTypeStateNodes(
               istate.state,
-              (0, import_chunk_HHQDDCTP.map)(
+              (0, import_chunk_QFQPBQSO.map)(
                 event.decl,
                 (decl2) => decl2.type === "VariableDeclarator" && decl2.stack[decl2.stack.length - 1].sn
               ).filter(
@@ -15147,7 +15149,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         });
         if (wasComputedDecl) {
           curState.map.forEach((value2, decls) => {
-            if ((0, import_chunk_HHQDDCTP.some)(
+            if ((0, import_chunk_QFQPBQSO.some)(
               decls,
               (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl)
             )) {
@@ -15191,14 +15193,14 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
                   }
                   if (!copyPropCandidate.ant || // If the ref isn't anticipated, we can't propagate it
                   // in case it has side effects.
-                  (0, import_chunk_HHQDDCTP.some)(
+                  (0, import_chunk_QFQPBQSO.some)(
                     event2.calleeDecl,
                     (callee) => callee.type === "FunctionDeclaration" && inlineRequested(state, callee)
                   )) {
                     return false;
                   }
                 }
-                if (!event2.decl || isTypeStateKey(event2.decl) && (0, import_chunk_HHQDDCTP.some)(
+                if (!event2.decl || isTypeStateKey(event2.decl) && (0, import_chunk_QFQPBQSO.some)(
                   event2.decl,
                   (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" || decl.type === "BinaryExpression" || decl.type === "Identifier"
                 )) {
@@ -15306,7 +15308,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     if (!successorsHandled) {
       if (logThisRun) {
         console.log(
-          `  merge to: ${(0, import_chunk_HHQDDCTP.map)(
+          `  merge to: ${(0, import_chunk_QFQPBQSO.map)(
             top.succs,
             (succ) => succ.order || -1
           ).join(", ")}`
@@ -15543,7 +15545,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         }, curInfo);
         if (rep === curInfo)
           return null;
-        const name = (0, import_chunk_HHQDDCTP.reduce)(
+        const name = (0, import_chunk_QFQPBQSO.reduce)(
           rep.decl,
           (cur, decl) => decl.type === "VariableDeclarator" ? decl.name : cur,
           null
@@ -15644,7 +15646,7 @@ function updateByAssocPath(path7, property, union) {
   return property;
 }
 var logging, missingNullWorkaround;
-var init_type_flow = (0, import_chunk_HHQDDCTP.__esm)({
+var init_type_flow = (0, import_chunk_QFQPBQSO.__esm)({
   "src/type-flow.ts"() {
     "use strict";
     init_api();
@@ -15663,7 +15665,7 @@ var init_type_flow = (0, import_chunk_HHQDDCTP.__esm)({
     init_type_flow_util();
     init_types();
     init_union_type();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     logging = true;
     missingNullWorkaround = true;
   }
@@ -15980,7 +15982,7 @@ function variableCleanup(node) {
   }
   return null;
 }
-var init_minimize_locals = (0, import_chunk_HHQDDCTP.__esm)({
+var init_minimize_locals = (0, import_chunk_QFQPBQSO.__esm)({
   "src/type-flow/minimize-locals.ts"() {
     "use strict";
     init_api();
@@ -16108,7 +16110,7 @@ function buildPREGraph(state, func) {
       const event = block.events[i];
       switch (event.type) {
         case "ref":
-          if ((0, import_chunk_HHQDDCTP.some)(
+          if ((0, import_chunk_QFQPBQSO.some)(
             event.decl,
             (decl) => decl.type === "Literal" || decl.type === "VariableDeclarator" && decl.node.kind === "const"
           )) {
@@ -16126,7 +16128,7 @@ function buildPREGraph(state, func) {
           defs.add(event.decl);
           break;
         case "mod":
-          if (event.callees && (0, import_chunk_HHQDDCTP.every)(event.callees, (callee) => callee.info === false)) {
+          if (event.callees && (0, import_chunk_QFQPBQSO.every)(event.callees, (callee) => callee.info === false)) {
             block.events.splice(i, 1);
             break;
           }
@@ -16365,7 +16367,7 @@ function computeAttributes(state, head) {
           }
           case "mod": {
             curState.forEach((candidates, decls) => {
-              if ((0, import_chunk_HHQDDCTP.some)(
+              if ((0, import_chunk_QFQPBQSO.some)(
                 decls,
                 (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && candidates.live && (!event.callees || event.callees.some(
                   (callee) => functionMayModify(state, callee, decl)
@@ -16645,7 +16647,7 @@ function applyReplacements(func, nodeMap, declMap) {
   );
 }
 var logging2, LocalRefCost;
-var init_pre = (0, import_chunk_HHQDDCTP.__esm)({
+var init_pre = (0, import_chunk_QFQPBQSO.__esm)({
   "src/pre.ts"() {
     "use strict";
     init_api();
@@ -16654,7 +16656,7 @@ var init_pre = (0, import_chunk_HHQDDCTP.__esm)({
     init_data_flow();
     init_function_info();
     init_minimize_locals();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     logging2 = false;
     LocalRefCost = 2;
   }
@@ -16834,7 +16836,7 @@ function isImportCandidate(module2, stack) {
     );
   });
 }
-var init_minimize_modules = (0, import_chunk_HHQDDCTP.__esm)({
+var init_minimize_modules = (0, import_chunk_QFQPBQSO.__esm)({
   "src/type-flow/minimize-modules.ts"() {
     "use strict";
     init_api();
@@ -16960,7 +16962,7 @@ function beforeEvaluate(istate, node) {
     case "UnaryExpression":
       if (node.operator === "-") {
         const [arg] = istate.stack.slice(-1);
-        if ((arg.value.type & (8 | 16)) === arg.value.type && arg.value.value == null) {
+        if ((arg.value.type & 120) === arg.value.type && arg.value.value == null) {
           const leftType = { type: 8, value: 0 };
           const rep = withLoc(
             {
@@ -16988,7 +16990,7 @@ function beforeEvaluate(istate, node) {
           break;
         }
         const id = node.right.argument;
-        if ((0, import_chunk_HHQDDCTP.every)(left.value.value, (m) => {
+        if ((0, import_chunk_QFQPBQSO.every)(left.value.value, (m) => {
           if (hasProperty(m.decls, id.name))
             return false;
           return istate.state.lookup({
@@ -17428,13 +17430,13 @@ function tryDeEnumerate(istate, node, elem) {
   }
   return null;
 }
-var init_optimize = (0, import_chunk_HHQDDCTP.__esm)({
+var init_optimize = (0, import_chunk_QFQPBQSO.__esm)({
   "src/type-flow/optimize.ts"() {
     "use strict";
     init_ast();
     init_inliner();
     init_type_flow();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_interp();
     init_interp_binary();
     init_types();
@@ -17601,7 +17603,7 @@ function cleanupUnusedVars(state, node) {
   });
   return changes;
 }
-var init_unused_exprs = (0, import_chunk_HHQDDCTP.__esm)({
+var init_unused_exprs = (0, import_chunk_QFQPBQSO.__esm)({
   "src/unused-exprs.ts"() {
     "use strict";
     init_api();
@@ -17966,7 +17968,7 @@ function markFunctionCalled(state, func) {
     state.calledFunctions[func.id.name] = [func];
     return;
   }
-  (0, import_chunk_HHQDDCTP.pushUnique)(state.calledFunctions[func.id.name], func);
+  (0, import_chunk_QFQPBQSO.pushUnique)(state.calledFunctions[func.id.name], func);
 }
 async function optimizeMonkeyC(fnMap, resourcesMap, manifestXML, config) {
   const state = await analyze(
@@ -18606,7 +18608,7 @@ function optimizeCall(istate, node, context) {
   callees.forEach((c) => markFunctionCalled(state, c.node));
   return null;
 }
-var init_mc_rewrite = (0, import_chunk_HHQDDCTP.__esm)({
+var init_mc_rewrite = (0, import_chunk_QFQPBQSO.__esm)({
   "src/mc-rewrite.ts"() {
     "use strict";
     init_api();
@@ -18624,12 +18626,12 @@ var init_mc_rewrite = (0, import_chunk_HHQDDCTP.__esm)({
     init_sub_type();
     init_types();
     init_unused_exprs();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_variable_renamer();
   }
 });
 var negativeFixups;
-var init_negative_fixups = (0, import_chunk_HHQDDCTP.__esm)({
+var init_negative_fixups = (0, import_chunk_QFQPBQSO.__esm)({
   "src/negative-fixups.ts"() {
     "use strict";
     negativeFixups = [
@@ -19174,7 +19176,7 @@ function add_one_resource(state, doc, module2, e) {
   }
 }
 var drawableSkips;
-var init_resources = (0, import_chunk_HHQDDCTP.__esm)({
+var init_resources = (0, import_chunk_QFQPBQSO.__esm)({
   "src/resources.ts"() {
     "use strict";
     init_api();
@@ -19378,7 +19380,7 @@ function visitReferences(state, ast, name, defn, callback, includeDefs = false,
   collectNamespaces(ast, state);
   delete state.pre;
 }
-var init_visitor = (0, import_chunk_HHQDDCTP.__esm)({
+var init_visitor = (0, import_chunk_QFQPBQSO.__esm)({
   "src/visitor.ts"() {
     "use strict";
     init_api();
@@ -19550,11 +19552,11 @@ function sameStateNodeDecl(a, b) {
 function sameLookupDefinition(a, b) {
   return (
     // sameStateNodeDecl(a.parent, b.parent) &&
-    (0, import_chunk_HHQDDCTP.sameArrays)(a.results, b.results, (ar, br) => sameStateNodeDecl(ar, br))
+    (0, import_chunk_QFQPBQSO.sameArrays)(a.results, b.results, (ar, br) => sameStateNodeDecl(ar, br))
   );
 }
 function sameLookupResult(a, b) {
-  return (0, import_chunk_HHQDDCTP.sameArrays)(a, b, sameLookupDefinition);
+  return (0, import_chunk_QFQPBQSO.sameArrays)(a, b, sameLookupDefinition);
 }
 function declKey(decl) {
   return isStateNode(decl) ? decl.type === "ModuleDeclaration" ? decl.fullName : decl.node : decl;
@@ -20021,7 +20023,7 @@ function stateFuncs() {
                     if (!hasProperty(this.index, name)) {
                       this.index[name] = [];
                     }
-                    (0, import_chunk_HHQDDCTP.pushUnique)(this.index[name], parent);
+                    (0, import_chunk_QFQPBQSO.pushUnique)(this.index[name], parent);
                   }
                 });
                 break;
@@ -20077,7 +20079,7 @@ function stateFuncs() {
                   if (!hasProperty(values, name)) {
                     values[name] = [];
                   }
-                  if ((0, import_chunk_HHQDDCTP.pushUnique)(values[name], m) && currentEnum) {
+                  if ((0, import_chunk_QFQPBQSO.pushUnique)(values[name], m) && currentEnum) {
                     if (!this.enumMap)
                       this.enumMap = /* @__PURE__ */ new Map();
                     this.enumMap.set(m, currentEnum);
@@ -20085,7 +20087,7 @@ function stateFuncs() {
                   if (!hasProperty(this.index, name)) {
                     this.index[name] = [];
                   }
-                  (0, import_chunk_HHQDDCTP.pushUnique)(this.index[name], parent);
+                  (0, import_chunk_QFQPBQSO.pushUnique)(this.index[name], parent);
                 });
                 break;
               }
@@ -20524,7 +20526,7 @@ function getSuperClasses(klass) {
   });
   return superClasses;
 }
-var init_api = (0, import_chunk_HHQDDCTP.__esm)({
+var init_api = (0, import_chunk_QFQPBQSO.__esm)({
   "src/api.ts"() {
     init_ast();
     init_mc_rewrite();
@@ -20534,7 +20536,7 @@ var init_api = (0, import_chunk_HHQDDCTP.__esm)({
     init_sdk_util();
     init_type_flow_util();
     init_types();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_visitor();
   }
 });
@@ -20650,7 +20652,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
     }
     const decl = lookupDefToDecl(results);
     if (decl && path7.length) {
-      if (wantsAllRefs && (0, import_chunk_HHQDDCTP.every)(
+      if (wantsAllRefs && (0, import_chunk_QFQPBQSO.every)(
         decl,
         (d) => d.type === "VariableDeclarator" || d.type === "BinaryExpression" || d.type === "Identifier"
       )) {
@@ -20758,7 +20760,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
             const decls = findDecl(node);
             if (!decls)
               break;
-            if (trackInsertionPoints && (0, import_chunk_HHQDDCTP.some)(decls, (decl) => {
+            if (trackInsertionPoints && (0, import_chunk_QFQPBQSO.some)(decls, (decl) => {
               if (decl.type === "VariableDeclarator") {
                 const defStmts = decl.node.kind === "var" && liveDefs.get(null) || liveDefs.get(decl);
                 if (defStmts) {
@@ -21001,7 +21003,7 @@ function getFlowEvent(node, stmt, findDecl) {
   return null;
 }
 var DataflowQueue;
-var init_data_flow = (0, import_chunk_HHQDDCTP.__esm)({
+var init_data_flow = (0, import_chunk_QFQPBQSO.__esm)({
   "src/data-flow.ts"() {
     "use strict";
     init_api();
@@ -21009,8 +21011,8 @@ var init_data_flow = (0, import_chunk_HHQDDCTP.__esm)({
     init_control_flow();
     init_function_info();
     init_type_flow_util();
-    (0, import_chunk_HHQDDCTP.init_util)();
-    DataflowQueue = class extends import_chunk_HHQDDCTP.GenericQueue {
+    (0, import_chunk_QFQPBQSO.init_util)();
+    DataflowQueue = class extends import_chunk_QFQPBQSO.GenericQueue {
       constructor() {
         super((b, a) => (a.order || 0) - (b.order || 0));
       }
@@ -21303,6 +21305,74 @@ function getOpInfo(bytecode) {
       unhandledType(bytecode);
   }
 }
+function getOpEffects(bytecode) {
+  switch (bytecode.op) {
+    case 19:
+      return 1;
+    case 14:
+      return 2;
+    case 17:
+      return 4;
+    case 21:
+      return 2 | 4;
+    case 15:
+      return 8 | 2 | 4;
+    case 0:
+    case 23:
+    case 1:
+    case 53:
+    case 25:
+    case 35:
+    case 2:
+    case 22:
+    case 51:
+    case 40:
+    case 41:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+    case 8:
+    case 9:
+    case 10:
+    case 11:
+    case 12:
+    case 26:
+    case 27:
+    case 28:
+    case 29:
+    case 30:
+    case 31:
+    case 34:
+    case 33:
+    case 13:
+    case 16:
+    case 32:
+    case 45:
+    case 48:
+    case 20:
+    case 54:
+    case 47:
+    case 42:
+    case 44:
+    case 43:
+    case 18:
+    case 46:
+    case 24:
+    case 37:
+    case 38:
+    case 39:
+    case 52:
+    case 49:
+    case 50:
+      return 0;
+    case 36:
+      throw new Error(`Unknown opcode ${bytecode.op}`);
+    default:
+      unhandledType(bytecode);
+  }
+}
 function isBoolOp(op) {
   switch (op) {
     case 32:
@@ -21327,7 +21397,7 @@ function isCondBranch(op) {
   return false;
 }
 var Opcodes;
-var init_opcodes = (0, import_chunk_HHQDDCTP.__esm)({
+var init_opcodes = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/opcodes.ts"() {
     "use strict";
     init_data_flow();
@@ -21408,6 +21478,45 @@ function postOrderTraverse2(func, visitor) {
   };
   helper(func.offset);
 }
+function intersect(a, b) {
+  if (a.size > b.size)
+    return intersect(b, a);
+  const result = /* @__PURE__ */ new Set();
+  a.forEach((x) => b.has(x) && result.add(x));
+  return result;
+}
+function computeDominators(func) {
+  const states = /* @__PURE__ */ new Map();
+  rpoPropagate(
+    func,
+    (block) => {
+      let state = states.get(block.offset);
+      if (!state) {
+        state = /* @__PURE__ */ new Set();
+        states.set(block.offset, state);
+      }
+      return new Set(state).add(block.offset);
+    },
+    null,
+    () => {
+    },
+    (from, state, succBlock) => {
+      const succState = states.get(succBlock.offset);
+      if (!succState) {
+        states.set(succBlock.offset, new Set(state));
+        return true;
+      }
+      const newState = intersect(state, succState);
+      if (newState.size !== succState.size) {
+        states.set(succBlock.offset, newState);
+        return true;
+      }
+      return false;
+    }
+  );
+  states.forEach((state, offset) => state.add(offset));
+  return states;
+}
 function computeJsrMap(func) {
   const jsrMap = /* @__PURE__ */ new Map();
   const findRets = (offset, rets, visited) => {
@@ -21439,7 +21548,7 @@ function computeJsrMap(func) {
 }
 function postOrderPropagate(func, preBlock, processBc, postBlock, merge) {
   const order = /* @__PURE__ */ new Map();
-  const queue = new import_chunk_HHQDDCTP.GenericQueue(
+  const queue = new import_chunk_QFQPBQSO.GenericQueue(
     (b, a) => order.get(a) - order.get(b)
   );
   postOrderTraverse2(func, (block) => {
@@ -21498,7 +21607,7 @@ function rpoPropagate(func, preBlock, processBc, postBlock, merge) {
     });
     blocks.reverse().forEach((block, i) => order.set(block, i));
   }
-  const queue = new import_chunk_HHQDDCTP.GenericQueue(
+  const queue = new import_chunk_QFQPBQSO.GenericQueue(
     (b, a) => order.get(a) - order.get(b)
   );
   queue.enqueue(func.blocks.get(func.offset));
@@ -21511,15 +21620,17 @@ function rpoPropagate(func, preBlock, processBc, postBlock, merge) {
       merge(top, localState, toBlock, isExSucc) && queue.enqueue(toBlock);
     };
     let flags;
-    for (let i = 0; i < top.bytecodes.length; i++) {
-      const bc = top.bytecodes[i];
-      flags = processBc(top, bc, localState);
-      if (flags != null && flags & 16) {
-        i = -1;
-        continue;
-      }
-      if (top.exsucc && (bc.op === 15 || bc.op === 51)) {
-        doMerge(top.exsucc, true);
+    if (processBc) {
+      for (let i = 0; i < top.bytecodes.length; i++) {
+        const bc = top.bytecodes[i];
+        flags = processBc(top, bc, localState);
+        if (flags != null && flags & 16) {
+          i = -1;
+          continue;
+        }
+        if (top.exsucc && (bc.op === 15 || bc.op === 51)) {
+          doMerge(top.exsucc, true);
+        }
       }
     }
     postBlock(top, localState);
@@ -21541,13 +21652,216 @@ function rpoPropagate(func, preBlock, processBc, postBlock, merge) {
         queue.enqueue(func.blocks.get(top.taken));
       }
     }
+    if (!processBc && top.exsucc) {
+      doMerge(top.exsucc, true);
+    }
     retMap.get(top.offset)?.forEach((retSucc) => doMerge(retSucc, false));
   }
 }
-var init_cflow = (0, import_chunk_HHQDDCTP.__esm)({
+var init_cflow = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/cflow.ts"() {
     "use strict";
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
+    init_opcodes();
+  }
+});
+function sizeBasedPRE2(func, context) {
+  if (func.argc == null) {
+    return;
+  }
+  const canonicalMap = /* @__PURE__ */ new Map();
+  let states = /* @__PURE__ */ new Map();
+  let incSp = null;
+  const getBigInt = (bc, index, bcs) => {
+    switch (bc.op) {
+      case 50: {
+        const buffer = new ArrayBuffer(Float64Array.BYTES_PER_ELEMENT);
+        const view = new DataView(buffer);
+        view.setFloat64(0, bc.arg);
+        return view.getBigInt64(0) << 8n | BigInt(bc.op);
+      }
+      case 38: {
+        const buffer = new ArrayBuffer(Float32Array.BYTES_PER_ELEMENT);
+        const view = new DataView(buffer);
+        view.setFloat32(0, bc.arg);
+        return BigInt(view.getInt32(0)) << 8n | BigInt(bc.op);
+      }
+      case 39:
+        if (bcs[index + 1]?.op === 48) {
+          break;
+        }
+      case 37:
+      case 49:
+      case 52:
+      case 24:
+        return BigInt(bc.arg) << 8n | BigInt(bc.op);
+      case 1:
+        if (incSp != null) {
+          incSp = false;
+        }
+        incSp = bc;
+        return null;
+      case 48:
+        if (index && bcs[index - 1].op === 39) {
+          return BigInt(bcs[index - 1].arg) << 8n | BigInt(bc.op);
+        }
+        break;
+    }
+    return null;
+  };
+  const order = /* @__PURE__ */ new Map();
+  postOrderTraverse2(func, (block) => {
+    order.set(block.offset, order.size);
+  });
+  order.forEach((order2, offset) => {
+    const block = func.blocks.get(offset);
+    (0, import_node_assert7.default)(block);
+    const state = /* @__PURE__ */ new Map();
+    block.bytecodes.forEach((bc, i, bcs) => {
+      const id = getBigInt(bc, i, bcs);
+      if (id == null)
+        return;
+      let canon = canonicalMap.get(id);
+      if (!canon) {
+        canon = /* @__PURE__ */ new Set();
+        canonicalMap.set(id, canon);
+      }
+      canon.add(bc);
+      state.set(id, canon);
+    });
+    states.set(block.offset, state);
+  });
+  if (incSp === false) {
+    return;
+  }
+  states = new Map(
+    Array.from(states).map(
+      ([offset, state]) => [
+        offset,
+        new Map(Array.from(state).filter(([, bcs]) => bcs.size >= 3))
+      ]
+    ).filter(([, state]) => state.size)
+  );
+  if (!states.size)
+    return;
+  const dominatorMap = computeDominators(func);
+  const insertionBlocks = /* @__PURE__ */ new Map();
+  states.forEach((state, offset) => {
+    const dominators = dominatorMap.get(offset);
+    (0, import_node_assert7.default)(dominators);
+    state.forEach((bcs, key) => {
+      const insertions = insertionBlocks.get(key);
+      if (!insertions) {
+        insertionBlocks.set(key, dominators);
+      } else {
+        insertionBlocks.set(key, intersect(insertions, dominators));
+      }
+    });
+  });
+  let nextSlot = func.argc + (incSp?.arg ?? 0);
+  const bytecode = (op, arg) => {
+    const bc = { op, arg, size: opcodeSize(op), offset: context.nextOffset++ };
+    if (arg == null)
+      delete bc.arg;
+    return bc;
+  };
+  if ((0, import_chunk_QFQPBQSO.wouldLog)("pre", 1)) {
+    if ((0, import_chunk_QFQPBQSO.wouldLog)("pre", 5)) {
+      (0, import_chunk_QFQPBQSO.log)(functionBanner(func, context, "PRE")());
+    } else {
+      (0, import_chunk_QFQPBQSO.log)(`================ PRE : ${func.name} ================
+`);
+    }
+    insertionBlocks.forEach((o, key) => {
+      const bcs = canonicalMap.get(key);
+      (0, import_chunk_QFQPBQSO.log)(
+        `Replacing ${bcs.size} instances of ${bytecodeToString(
+          bcs.values().next().value,
+          context.symbolTable
+        )}`
+      );
+    });
+  }
+  insertionBlocks.forEach((blockOffsets, key) => {
+    const blockOffset = Array.from(blockOffsets).sort(
+      (a, b) => order.get(a) - order.get(b)
+    )[0];
+    (0, import_node_assert7.default)(blockOffset != null);
+    const block = func.blocks.get(blockOffset);
+    (0, import_node_assert7.default)(block);
+    const bcs = canonicalMap.get(key);
+    (0, import_node_assert7.default)(bcs);
+    let index = block.bytecodes.findIndex((bc2) => bcs.has(bc2));
+    if (index < 0) {
+      if (block.next && !block.taken) {
+        index = block.bytecodes.length;
+      }
+    }
+    const bc = bcs.values().next().value;
+    const slot = nextSlot++;
+    if (bc.op === 48) {
+      (0, import_node_assert7.default)(index !== 0);
+      let spush = null;
+      func.blocks.forEach(
+        (b) => states.get(b.offset)?.get(key) && b.bytecodes.forEach((bc2, i) => {
+          if (bcs.has(bc2)) {
+            (0, import_node_assert7.default)(i > 0);
+            const prev = b.bytecodes[i - 1];
+            if (!spush) {
+              spush = { ...prev };
+            }
+            bc2.op = 0;
+            prev.op = 18;
+            prev.arg = slot;
+            prev.size = 2;
+          }
+        })
+      );
+      (0, import_node_assert7.default)(spush);
+      if (index >= 0 && index < block.bytecodes.length) {
+        index--;
+      }
+      block.bytecodes.splice(
+        index,
+        0,
+        bytecode(spush.op, spush.arg),
+        bytecode(48, void 0),
+        bytecode(19, slot)
+      );
+    } else {
+      block.bytecodes.splice(
+        index,
+        0,
+        bytecode(bc.op, bc.arg),
+        bytecode(19, slot)
+      );
+      bcs.forEach((bc2) => {
+        bc2.op = 18;
+        bc2.arg = slot;
+        bc2.size = 2;
+      });
+    }
+  });
+  if (incSp) {
+    incSp.arg += insertionBlocks.size;
+  } else {
+    const startBlock = func.blocks.get(func.offset);
+    const index = startBlock.bytecodes.length === 0 || startBlock.bytecodes[0].op !== 53 ? 0 : 1;
+    startBlock.bytecodes.splice(
+      index,
+      0,
+      bytecode(1, insertionBlocks.size)
+    );
+  }
+  (0, import_chunk_QFQPBQSO.logger)("pre", 5, functionBanner(func, context, "post-PRE"));
+  return true;
+}
+var init_pre2 = (0, import_chunk_QFQPBQSO.__esm)({
+  "src/readprg/pre.ts"() {
+    "use strict";
+    (0, import_chunk_QFQPBQSO.init_logger)();
+    init_bytecode();
+    init_cflow();
     init_opcodes();
   }
 });
@@ -21571,7 +21885,7 @@ function checkState(state) {
   const checkArray = (items) => items.forEach((item) => {
     item.equivs?.forEach((e) => {
       if (getEquivs(state, e) !== item.equivs) {
-        (0, import_node_assert7.default)(getEquivs(state, e) === item.equivs);
+        (0, import_node_assert8.default)(getEquivs(state, e) === item.equivs);
       }
     });
   });
@@ -21947,6 +22261,16 @@ function interpBytecode(bc, localState, context) {
     case 30:
       binary(">=");
       break;
+    case 45: {
+      removeEquiv2(localState, -localState.stack.length);
+      const arg = localState.stack.pop()?.type ?? {
+        type: 524287
+        /* Any */
+      };
+      const result = evaluateUnaryTypes("~", arg);
+      localState.stack.push({ type: result });
+      break;
+    }
     default: {
       const { pop, push } = getOpInfo(bc);
       for (let i = 0; i < pop; i++) {
@@ -21965,31 +22289,57 @@ function interpBytecode(bc, localState, context) {
 }
 function interpFunc(func, context) {
   const { symbolTable } = context;
+  const resolvedBranches = /* @__PURE__ */ new Map();
   const equivSets = /* @__PURE__ */ new Map();
   const selfStores = /* @__PURE__ */ new Set();
   const liveInState = /* @__PURE__ */ new Map();
   const replacements = /* @__PURE__ */ new Map();
-  const interpLogging = (0, import_chunk_HHQDDCTP.wouldLog)("interp", 1);
+  const interpLogging = (0, import_chunk_QFQPBQSO.wouldLog)("interp", 1);
   if (interpLogging) {
-    if ((0, import_chunk_HHQDDCTP.wouldLog)("interp", 7)) {
-      (0, import_chunk_HHQDDCTP.setBanner)(functionBanner(func, context, "interp"));
-    } else if ((0, import_chunk_HHQDDCTP.wouldLog)("interp", 3)) {
-      (0, import_chunk_HHQDDCTP.setBanner)(
+    if ((0, import_chunk_QFQPBQSO.wouldLog)("interp", 7)) {
+      (0, import_chunk_QFQPBQSO.setBanner)(functionBanner(func, context, "interp"));
+    } else if ((0, import_chunk_QFQPBQSO.wouldLog)("interp", 3)) {
+      (0, import_chunk_QFQPBQSO.setBanner)(
         () => `+++++++++++++ interp-prepare ${func.name} ++++++++++++++`
       );
     }
   }
+  const branchRedirects = /* @__PURE__ */ new Map();
+  const safeBranchBlocks = /* @__PURE__ */ new Map();
+  func.blocks.forEach((block) => {
+    if (block.taken == null || block.next == null)
+      return;
+    if ((block.preds?.size ?? 0) <= 1)
+      return;
+    const maxpops = 1;
+    let depth = maxpops;
+    let mindepth = maxpops;
+    if (block.bytecodes.every((bc) => {
+      if (getOpEffects(bc))
+        return false;
+      const { push, pop } = getOpInfo(bc);
+      depth -= pop;
+      if (depth < 0)
+        return false;
+      if (depth < mindepth)
+        mindepth = depth;
+      depth += push;
+      return true;
+    }) && depth === mindepth) {
+      safeBranchBlocks.set(block.offset, maxpops - depth);
+    }
+  });
   rpoPropagate(
     func,
     (block) => {
       if (interpLogging) {
-        (0, import_chunk_HHQDDCTP.logger)(
+        (0, import_chunk_QFQPBQSO.logger)(
           "interp",
           3,
           `${offsetToString(block.offset)}: ${block.bytecodes[0]?.lineNum ? lineInfoToString(block.bytecodes[0]?.lineNum, context) : ""}
  ${interpStateToString(liveInState.get(block.offset))}`
         );
-        (0, import_chunk_HHQDDCTP.logger)("interp", 9, blockToString(block, context));
+        (0, import_chunk_QFQPBQSO.logger)("interp", 9, () => blockToString(block, context));
       }
       return cloneState2(liveInState.get(block.offset));
     },
@@ -22025,7 +22375,7 @@ function interpFunc(func, context) {
         case 39: {
           interpBytecode(bc, localState, context);
           const topType = localState.stack[localState.stack.length - 1].type;
-          (0, import_node_assert7.default)(isExact(topType));
+          (0, import_node_assert8.default)(isExact(topType));
           const index = localState.loopBlock ? null : findEquivalent(localState, topType.type, topType.value);
           let blockReps = replacements.get(block);
           if (index != null) {
@@ -22061,15 +22411,15 @@ function interpFunc(func, context) {
           break;
         }
         case 40:
-        case 41:
+        case 41: {
           if (block.taken === block.offset) {
             const inState = liveInState.get(block.offset);
-            (0, import_node_assert7.default)(inState);
+            (0, import_node_assert8.default)(inState);
             if (inState.stack.length !== localState.stack.length - 1) {
               const condition = localState.stack[localState.stack.length - 1];
               const isTrue = mustBeTrue(condition.type);
               const isFalse = mustBeFalse(condition.type);
-              (0, import_node_assert7.default)(isTrue || isFalse);
+              (0, import_node_assert8.default)(isTrue || isFalse);
               interpBytecode(bc, localState, context);
               if (isTrue === (bc.op === 40)) {
                 localState.loopBlock = true;
@@ -22079,14 +22429,52 @@ function interpFunc(func, context) {
               return 4;
             }
           }
+          resolvedBranches.delete(block);
+          let flags = 0;
+          const top = localState.stack[localState.stack.length - 1];
+          if (top) {
+            const isTrue = mustBeTrue(top.type);
+            if (isTrue || mustBeFalse(top.type)) {
+              const isTaken = isTrue === (bc.op === 40);
+              flags = isTaken ? 8 : 4;
+              resolvedBranches.set(block, isTaken);
+            }
+          }
           interpBytecode(bc, localState, context);
-          break;
+          return flags;
+        }
         default:
           interpBytecode(bc, localState, context);
       }
       return null;
     },
-    () => {
+    (block, localState) => {
+      const branchRedirect = (block2, localState2, next) => {
+        if (next != null && !resolvedBranches.has(block2) && safeBranchBlocks.has(next) && (block2.taken == null || safeBranchBlocks.get(next) === 0)) {
+          const state = cloneState2(localState2);
+          const branchBlock = func.blocks.get(next);
+          return branchBlock.bytecodes.every((bc) => {
+            if (isCondBranch(bc.op)) {
+              const top = state.stack[state.stack.length - 1];
+              const isTrue = mustBeTrue(top.type);
+              if (isTrue || mustBeFalse(top.type)) {
+                branchRedirects.set(block2, {
+                  from: next,
+                  to: isTrue === (bc.op === 40) ? branchBlock.taken : branchBlock.next
+                });
+                return true;
+              }
+              return false;
+            }
+            interpBytecode(bc, state, context);
+            return true;
+          });
+        }
+        return false;
+      };
+      if (localState.loopBlock || !branchRedirect(block, localState, block.next) && !branchRedirect(block, localState, block.taken)) {
+        branchRedirects.delete(block);
+      }
     },
     (from, localState, succBlock, isExSucc) => {
       if (isExSucc) {
@@ -22112,14 +22500,14 @@ function interpFunc(func, context) {
       if (!mergeInto(localState, succState))
         return false;
       if (interpLogging) {
-        (0, import_chunk_HHQDDCTP.logger)("interp", 3, `Re-Merge to ${offsetToString(succBlock.offset)}`);
+        (0, import_chunk_QFQPBQSO.logger)("interp", 3, `Re-Merge to ${offsetToString(succBlock.offset)}`);
       }
       return true;
     }
   );
   if (interpLogging) {
-    if ((0, import_chunk_HHQDDCTP.wouldLog)("interp", 5)) {
-      (0, import_chunk_HHQDDCTP.setBanner)(
+    if ((0, import_chunk_QFQPBQSO.wouldLog)("interp", 5)) {
+      (0, import_chunk_QFQPBQSO.setBanner)(
         functionBanner(func, context, "interp", (block, footer) => {
           if (footer)
             return "";
@@ -22127,32 +22515,50 @@ function interpFunc(func, context) {
         })
       );
     } else {
-      (0, import_chunk_HHQDDCTP.setBanner)(() => `=============== interp ${func.name} ==============`);
+      (0, import_chunk_QFQPBQSO.setBanner)(() => `=============== interp ${func.name} ==============`);
     }
     if (equivSets.size) {
-      (0, import_chunk_HHQDDCTP.log)(`====== equivSets =====`);
+      (0, import_chunk_QFQPBQSO.log)(`====== equivSets =====`);
       equivSets.forEach(
-        (value2, key) => (0, import_chunk_HHQDDCTP.log)(
+        (value2, key) => (0, import_chunk_QFQPBQSO.log)(
           `L${key.arg} === ${Array.from(value2).sort().join(" ")} ${key.lineNum ? lineInfoToString(key.lineNum, context) : ""}`
         )
       );
     }
     if (selfStores.size) {
-      (0, import_chunk_HHQDDCTP.log)(`====== selfStores =====`);
+      (0, import_chunk_QFQPBQSO.log)(`====== selfStores =====`);
       selfStores.forEach(
-        (value2) => (0, import_chunk_HHQDDCTP.log)(`${bytecodeToString(value2, symbolTable)}`)
+        (value2) => (0, import_chunk_QFQPBQSO.log)(`${bytecodeToString(value2, symbolTable)}`)
       );
     }
     if (replacements.size) {
-      (0, import_chunk_HHQDDCTP.log)(`====== replacements =====`);
+      (0, import_chunk_QFQPBQSO.log)(`====== replacements =====`);
       replacements.forEach(
         (blockRep) => blockRep.forEach(
-          (rep, bc) => (0, import_chunk_HHQDDCTP.log)(
+          (rep, bc) => (0, import_chunk_QFQPBQSO.log)(
             `${bytecodeToString(bc, symbolTable)} => ${rep.invert ? "~" : ""}${bytecodeToString(rep, symbolTable)} ${bc.lineNum ? lineInfoToString(bc.lineNum, context) : ""}`
           )
         )
       );
     }
+    if (resolvedBranches.size) {
+      (0, import_chunk_QFQPBQSO.log)(`====== resolved branches =====`);
+      resolvedBranches.forEach(
+        (isTaken, block) => (0, import_chunk_QFQPBQSO.log)(
+          `block ${offsetToString(block.offset)} is ${isTaken ? "always" : "never"} taken`
+        )
+      );
+    }
+    if (branchRedirects.size) {
+      (0, import_chunk_QFQPBQSO.log)(`====== redirected branches =====`);
+      branchRedirects.forEach(
+        ({ to, from }, block) => (0, import_chunk_QFQPBQSO.log)(
+          `block ${offsetToString(
+            block.offset
+          )} redirects from ${offsetToString(from)} to ${offsetToString(to)}${safeBranchBlocks.get(from) ? ` popping ${safeBranchBlocks.get(from)}` : ""}`
+        )
+      );
+    }
   }
   selfStores.forEach((bc) => makeArgless(
     bc,
@@ -22176,15 +22582,48 @@ function interpFunc(func, context) {
         const invv = { ...orig };
         invv.op = 45;
         invv.size = 1;
-        invv.offset++;
+        invv.offset = context.nextOffset++;
         delete invv.arg;
         block.bytecodes.splice(i + 1, 0, invv);
       }
     }
   });
+  resolvedBranches.forEach((isTaken, block) => {
+    const branch = block.bytecodes[block.bytecodes.length - 1];
+    (0, import_node_assert8.default)(branch && isCondBranch(branch.op));
+    if (isTaken) {
+      redirect(func, block, block.next, block.taken);
+    } else {
+      redirect(func, block, block.taken, block.next);
+    }
+    delete block.taken;
+    makeArgless(
+      branch,
+      2
+      /* popv */
+    );
+  });
+  branchRedirects.forEach(({ from, to }, block) => {
+    const pops = safeBranchBlocks.get(from);
+    redirect(func, block, from, to);
+    if (pops) {
+      (0, import_node_assert8.default)(block.next && !block.taken);
+      for (let i = 0; i < pops; i++) {
+        block.bytecodes.push({
+          op: 2,
+          size: 1,
+          offset: context.nextOffset++
+        });
+      }
+    }
+  });
   if (interpLogging)
-    (0, import_chunk_HHQDDCTP.setBanner)(null);
-  return { liveInState, equivSets };
+    (0, import_chunk_QFQPBQSO.setBanner)(null);
+  return {
+    liveInState,
+    equivSets,
+    changes: selfStores.size || replacements.size || resolvedBranches.size || branchRedirects.size
+  };
 }
 function instForType(type, offset) {
   if (!hasValue(type))
@@ -22217,7 +22656,7 @@ function instForType(type, offset) {
       };
     case 131072: {
       const match = type.value.match(/<(\d+)>$/);
-      (0, import_node_assert7.default)(match);
+      (0, import_node_assert8.default)(match);
       return {
         op: 37,
         arg: parseInt(match[1], 10),
@@ -22228,11 +22667,11 @@ function instForType(type, offset) {
   }
   return null;
 }
-var init_interp2 = (0, import_chunk_HHQDDCTP.__esm)({
+var init_interp2 = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/interp.ts"() {
     "use strict";
     init_interp_binary();
-    (0, import_chunk_HHQDDCTP.init_logger)();
+    (0, import_chunk_QFQPBQSO.init_logger)();
     init_interp();
     init_types();
     init_union_type();
@@ -22242,7 +22681,7 @@ var init_interp2 = (0, import_chunk_HHQDDCTP.__esm)({
   }
 });
 function optimizeArrayInit(func, block, index, context, interpState) {
-  (0, import_node_assert8.default)(
+  (0, import_node_assert9.default)(
     block.bytecodes[index].op === 20 || block.bytecodes[index].op === 54
     /* newba */
   );
@@ -22340,10 +22779,10 @@ function optimizeArrayInit(func, block, index, context, interpState) {
     i = found;
   }
   if (initType && (block.bytecodes[index].op === 20 ? initType.type === 1 : initType.type === 8 && initType.value === 0)) {
-    (0, import_chunk_HHQDDCTP.logger)(
+    (0, import_chunk_QFQPBQSO.logger)(
       "array-init",
       1,
-      `${func.name}: Removing initialization of default initialized ${putvStarts.length} element array init at block ${offsetToString(
+      () => `${func.name}: Removing initialization of default initialized ${putvStarts.length} element array init at block ${offsetToString(
         block.offset
       )}, starting at index ${index}, at offset ${offsetToString(
         block.bytecodes[index].offset
@@ -22360,7 +22799,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
       bc.op = 2;
       bc.size = 1;
       delete bc.arg;
-      (0, import_node_assert8.default)(
+      (0, import_node_assert9.default)(
         op === 17
         /* aputv */
       );
@@ -22373,17 +22812,17 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         convertAputv(offset - 1);
       }
     }
-    (0, import_chunk_HHQDDCTP.logger)(
+    (0, import_chunk_QFQPBQSO.logger)(
       "array-init",
       1,
-      `${func.name}: Optimizing unused ${putvStarts.length} element array init at block ${offsetToString(
+      () => `${func.name}: Optimizing unused ${putvStarts.length} element array init at block ${offsetToString(
         block.offset
       )}, starting at index ${index}, at offset ${offsetToString(
         block.bytecodes[index].offset
       )}`
     );
-    if ((0, import_chunk_HHQDDCTP.wouldLog)("array-init", 5)) {
-      (0, import_chunk_HHQDDCTP.log)(blockToString(block, context));
+    if ((0, import_chunk_QFQPBQSO.wouldLog)("array-init", 5)) {
+      (0, import_chunk_QFQPBQSO.log)(blockToString(block, context));
     }
     return true;
   }
@@ -22401,7 +22840,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
       for (let ix = putvStarts.length; ix--; ) {
         const dupIx = ++putvStarts[ix];
         const dup = block.bytecodes[dupIx];
-        (0, import_node_assert8.default)(dup.op === 46 && dup.arg === 0);
+        (0, import_node_assert9.default)(dup.op === 46 && dup.arg === 0);
         block.bytecodes[dupIx].op = 18;
         block.bytecodes[dupIx].arg = local;
       }
@@ -22423,10 +22862,10 @@ function optimizeArrayInit(func, block, index, context, interpState) {
     if (putvStarts.length < 3)
       return false;
     tryLocal(3);
-    (0, import_chunk_HHQDDCTP.logger)(
+    (0, import_chunk_QFQPBQSO.logger)(
       "array-init",
       1,
-      `${func.name}: Optimizing ${putvStarts.length} element array init with constant initializer ${bytecodeToString(
+      () => `${func.name}: Optimizing ${putvStarts.length} element array init with constant initializer ${bytecodeToString(
         initInst,
         null
       )} at block ${offsetToString(
@@ -22449,10 +22888,10 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         block.bytecodes[index + 1].arg = putvStarts.length;
       }
     }
-    (0, import_chunk_HHQDDCTP.logger)(
+    (0, import_chunk_QFQPBQSO.logger)(
       "array-init",
       5,
-      `index: ${index}, i: ${i}
+      () => `index: ${index}, i: ${i}
 ${blockToString(block, context)}`
     );
     const loopOffset2 = context.nextOffset;
@@ -22487,10 +22926,10 @@ ${blockToString(block, context)}`
   for (let i2 = putvStarts.length; i2-- > 1; ) {
     block.bytecodes.splice(putvStarts[i2], 2);
   }
-  (0, import_chunk_HHQDDCTP.logger)(
+  (0, import_chunk_QFQPBQSO.logger)(
     "array-init",
     1,
-    `${func.name}: Optimizing ${putvStarts.length} element array init at block ${offsetToString(
+    () => `${func.name}: Optimizing ${putvStarts.length} element array init at block ${offsetToString(
       block.offset
     )}, starting at index ${index}, at offset ${offsetToString(
       block.bytecodes[index].offset
@@ -22542,19 +22981,19 @@ ${blockToString(block, context)}`
   loop.taken = loopOffset;
   return true;
 }
-var init_array_init = (0, import_chunk_HHQDDCTP.__esm)({
+var init_array_init = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/array-init.ts"() {
     "use strict";
     init_types();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_bytecode();
     init_interp2();
     init_opcodes();
   }
 });
 function localDCE(func, context) {
-  if ((0, import_chunk_HHQDDCTP.wouldLog)("dce", 5)) {
-    (0, import_chunk_HHQDDCTP.setBanner)(
+  if ((0, import_chunk_QFQPBQSO.wouldLog)("dce", 5)) {
+    (0, import_chunk_QFQPBQSO.setBanner)(
       functionBanner(
         func,
         context,
@@ -22587,10 +23026,10 @@ function localDCE(func, context) {
   };
   func.blocks.forEach((block) => {
     const reportPopv = (i, item, kill) => {
-      (0, import_chunk_HHQDDCTP.logger)(
+      (0, import_chunk_QFQPBQSO.logger)(
         "dce",
         2,
-        `${func.name}: Convert ${i}:${bytecodeToString(
+        () => `${func.name}: Convert ${i}:${bytecodeToString(
           block.bytecodes[i],
           context.symbolTable
         )} to popv for ${item.deps.map(
@@ -22602,10 +23041,12 @@ function localDCE(func, context) {
       );
     };
     const reportNop = (item) => {
-      (0, import_chunk_HHQDDCTP.logger)(
+      (0, import_chunk_QFQPBQSO.logger)(
         "dce",
         2,
-        `${func.name}: Kill ${item.deps.map((i) => bytecodeToString(block.bytecodes[i], context.symbolTable)).join(", ")}`
+        () => `${func.name}: Kill ${item.deps.map(
+          (i) => bytecodeToString(block.bytecodes[i], context.symbolTable)
+        ).join(", ")}`
       );
     };
     changes = false;
@@ -22619,10 +23060,10 @@ function localDCE(func, context) {
         case 19: {
           const liveLocal = dceInfo.locals.has(bytecode.arg);
           if (!liveLocal) {
-            (0, import_chunk_HHQDDCTP.logger)(
+            (0, import_chunk_QFQPBQSO.logger)(
               "dce",
               2,
-              `${func.name}: Killing store to unused local ${bytecode.arg} at ${offsetToString(block.offset)}:${i}`
+              () => `${func.name}: Killing store to unused local ${bytecode.arg} at ${offsetToString(block.offset)}:${i}`
             );
             makePopv(bytecode);
             dceInfo.stack.push({ dead: true, deps: [i] });
@@ -22740,12 +23181,10 @@ function localDCE(func, context) {
         (bc) => bc.op !== 0
         /* nop */
       );
-      if ((0, import_chunk_HHQDDCTP.wouldLog)("dce", 3)) {
-        (0, import_chunk_HHQDDCTP.log)(functionBanner(func, context, "local-dce-end")());
-      }
+      (0, import_chunk_QFQPBQSO.logger)("dce", 3, functionBanner(func, context, "local-dce-end"));
     }
   });
-  (0, import_chunk_HHQDDCTP.setBanner)(null);
+  (0, import_chunk_QFQPBQSO.setBanner)(null);
   return anyChanges;
 }
 function computeLiveLocals(func) {
@@ -22788,10 +23227,354 @@ function computeLiveLocals(func) {
   );
   return { liveInLocals, liveOutLocals };
 }
-var init_dce = (0, import_chunk_HHQDDCTP.__esm)({
+var init_dce = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/dce.ts"() {
     "use strict";
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
+    init_bytecode();
+    init_cflow();
+    init_opcodes();
+  }
+});
+function cloneLive(locals) {
+  const clone = /* @__PURE__ */ new Map();
+  locals?.forEach((value2, key) => clone.set(key, new Set(value2)));
+  return clone;
+}
+function mergeInto2(from, to) {
+  let changed = false;
+  from.forEach((local, key) => {
+    const curr = to.get(key);
+    if (!curr) {
+      to.set(key, new Set(local));
+      changed = true;
+      return;
+    }
+    local.forEach((inst) => {
+      if (!curr.has(inst)) {
+        changed = true;
+        curr.add(inst);
+      }
+    });
+  });
+  return changed;
+}
+function minimizeLocals2(func, equivSets, context) {
+  const splitRanges = computeSplitRanges(func, equivSets);
+  const locals = mergeSplitRanges(splitRanges);
+  const numLocals = Math.max(...Array.from(splitRanges.keys())) + 1;
+  (0, import_chunk_QFQPBQSO.logger)("locals", 10, functionBanner(func, context, "Minimize Locals"));
+  const colors = /* @__PURE__ */ new Map();
+  const merge = [];
+  locals.forEach((local, key) => {
+    if (key.op === 18 || key.arg === 0) {
+      colors.set(key, key.arg);
+      const merged = merge[key.arg];
+      if (merged) {
+        (0, import_node_assert10.default)(!key.arg);
+        merged.push(key);
+      } else {
+        merge[key.arg] = [key];
+      }
+    }
+  });
+  locals.forEach((local, key) => {
+    if (key.op === 18)
+      return;
+    let inUse = 0n;
+    local.conflicts.forEach((conflict) => {
+      const color = colors.get(conflict);
+      if (color != null) {
+        inUse |= 1n << BigInt(color);
+      }
+    });
+    let lowest = 0;
+    while (inUse & 1n) {
+      lowest++;
+      inUse >>= 1n;
+    }
+    colors.set(key, lowest);
+    if (!merge[lowest]) {
+      merge[lowest] = [key];
+    } else {
+      merge[lowest].push(key);
+    }
+  });
+  if (merge.length >= numLocals)
+    return false;
+  if ((0, import_chunk_QFQPBQSO.wouldLog)("locals", 1)) {
+    if (!(0, import_chunk_QFQPBQSO.wouldLog)("locals", 10)) {
+      (0, import_chunk_QFQPBQSO.logger)("locals", 5, functionBanner(func, context, "Minimize Locals"));
+    }
+    (0, import_chunk_QFQPBQSO.log)(
+      `>>> Merging locals in ${func.name} (in: ${numLocals} => out: ${merge.length})`
+    );
+    merge.slice().sort((a, b) => (colors.get(a[0]) ?? 0) - (colors.get(b[0]) ?? 0)).forEach(
+      (merged) => (0, import_chunk_QFQPBQSO.log)(
+        ` ${colors.get(merged[0])} - ${merged.map((k) => bytecodeToString(k, context.symbolTable)).join(" | ")}`
+      )
+    );
+  }
+  const fixupMap = /* @__PURE__ */ new Map();
+  locals.forEach((value2, key) => {
+    const color = colors.get(key);
+    (0, import_node_assert10.default)(color != null);
+    let name = null;
+    Array.from(value2.live).some((bc) => {
+      if ((bc.op === 18 || bc.op === 19) && bc.range) {
+        if (!name) {
+          name = bc.range.name;
+        } else if (name !== bc.range.name) {
+          if (typeof name === "string") {
+            name = /* @__PURE__ */ new Set([name]);
+          }
+          name.add(bc.range.name);
+        }
+      }
+    });
+    let range = null;
+    if (name) {
+      if (typeof name !== "string") {
+        name = Array.from(name).join("_");
+      }
+      range = { name, id: context.nextLocalId++ };
+      if (key.op === 18) {
+        range.isParam = true;
+      }
+    }
+    value2.live.forEach((bc) => fixupMap.set(bc, { color, range }));
+  });
+  let argc = null;
+  func.blocks.forEach((block) => {
+    let filter = false;
+    block.bytecodes.forEach((bc) => {
+      switch (bc.op) {
+        case 53:
+          argc = bc.arg;
+          break;
+        case 1: {
+          let newinc;
+          if (argc != null) {
+            newinc = merge.length - argc;
+          } else {
+            newinc = bc.arg + merge.length - numLocals;
+          }
+          if (newinc > 0) {
+            bc.arg = newinc;
+          } else {
+            const nop = bc;
+            nop.op = 0;
+            delete nop.arg;
+            nop.size = 1;
+            filter = true;
+          }
+          break;
+        }
+        case 18:
+        case 19: {
+          const info = fixupMap.get(bc);
+          (0, import_node_assert10.default)(info != null);
+          bc.arg = info.color;
+          if (info.range) {
+            bc.range = info.range;
+          } else {
+            delete bc.range;
+          }
+          break;
+        }
+      }
+    });
+    if (filter) {
+      block.bytecodes = block.bytecodes.filter(
+        (bc) => bc.op !== 0
+        /* nop */
+      );
+    }
+  });
+  return true;
+}
+function computeSplitRanges(func, equivSets) {
+  const liveOutLocals = /* @__PURE__ */ new Map();
+  const liveInLocals = /* @__PURE__ */ new Map();
+  const splitRanges = /* @__PURE__ */ new Map();
+  const recordLgetv = (locals, bc) => {
+    const bcs = locals.get(bc.arg);
+    if (!bcs) {
+      locals.set(bc.arg, /* @__PURE__ */ new Set([bc]));
+    } else {
+      bcs.add(bc);
+    }
+  };
+  const fakeLgetvs = /* @__PURE__ */ new Map();
+  postOrderPropagate(
+    func,
+    (block) => cloneLive(liveOutLocals.get(block.offset)),
+    (block, bc, locals) => {
+      switch (bc.op) {
+        case 42: {
+          let fakeLgetv = fakeLgetvs.get(bc);
+          if (!fakeLgetv) {
+            fakeLgetv = {
+              op: 18,
+              arg: 0,
+              size: 2,
+              offset: bc.offset
+            };
+            fakeLgetvs.set(bc, fakeLgetv);
+          }
+          recordLgetv(locals, fakeLgetv);
+          break;
+        }
+        case 18:
+          recordLgetv(locals, bc);
+          break;
+        case 19: {
+          let bcs = locals.get(bc.arg);
+          if (!bcs) {
+            bcs = /* @__PURE__ */ new Set();
+          }
+          let ranges = splitRanges.get(bc.arg);
+          const equiv = equivSets.get(bc);
+          const conflicts = /* @__PURE__ */ new Set();
+          locals.forEach((liveBcs, local) => {
+            if (local === bc.arg)
+              return;
+            if (equiv?.has(local))
+              return;
+            liveBcs.forEach((lbc) => conflicts.add(lbc));
+          });
+          if (!ranges) {
+            splitRanges.set(
+              bc.arg,
+              ranges = /* @__PURE__ */ new Map([[bc, { live: bcs, conflicts }]])
+            );
+          } else {
+            ranges.set(bc, { live: bcs, conflicts });
+          }
+          locals.delete(bc.arg);
+          break;
+        }
+        case 51:
+        case 15:
+          if (block.exsucc) {
+            const from = liveInLocals.get(block.exsucc);
+            if (from) {
+              mergeInto2(from, locals);
+            }
+          }
+          break;
+      }
+    },
+    (block, locals) => {
+      liveInLocals.set(block.offset, locals);
+    },
+    (locals, predBlock, isExPred) => {
+      if (isExPred)
+        return false;
+      const predLocals = liveOutLocals.get(predBlock.offset);
+      if (!predLocals) {
+        liveOutLocals.set(predBlock.offset, cloneLive(locals));
+        return true;
+      }
+      return mergeInto2(locals, predLocals);
+    }
+  );
+  const liveIn = liveInLocals.get(func.offset);
+  liveIn?.forEach((bcs, num) => {
+    const bc = bcs.values().next().value;
+    let range = splitRanges.get(num);
+    if (!range) {
+      splitRanges.set(num, range = /* @__PURE__ */ new Map());
+    }
+    range.set(bc, { live: bcs, conflicts: /* @__PURE__ */ new Set() });
+  });
+  return splitRanges;
+}
+function mergeSplitRanges(splitRanges) {
+  const bcToLiveRange = /* @__PURE__ */ new Map();
+  splitRanges.forEach((range, localid) => {
+    const reverseMap = /* @__PURE__ */ new Map();
+    const pvMap = /* @__PURE__ */ new Map();
+    range.forEach(({ live }, key) => {
+      const putvSetRef = { ref: /* @__PURE__ */ new Set([key]) };
+      pvMap.set(key, putvSetRef);
+      live.forEach((bc) => {
+        const m = reverseMap.get(bc);
+        if (!m) {
+          reverseMap.set(bc, putvSetRef);
+        } else if (m.ref !== putvSetRef.ref) {
+          putvSetRef.ref.forEach((pv) => {
+            m.ref.add(pv);
+            const other = pvMap.get(pv);
+            other.ref = m.ref;
+          });
+        }
+      });
+    });
+    const putvSets = /* @__PURE__ */ new Set();
+    reverseMap.forEach(({ ref }) => putvSets.add(ref));
+    range.forEach((x, key) => {
+      const num = Array.from(putvSets).reduce(
+        (count, set) => count + (set.has(key) ? 1 : 0),
+        0
+      );
+      (0, import_node_assert10.default)(num === 1);
+    });
+    const newRange = /* @__PURE__ */ new Map();
+    putvSets.forEach((pvSet) => {
+      let lputv = null;
+      let singleRange = null;
+      pvSet.forEach((pv) => {
+        if (!lputv || pv.op === 18)
+          lputv = pv;
+      });
+      pvSet.forEach((pv) => {
+        const { live, conflicts } = range.get(pv);
+        if (!singleRange) {
+          singleRange = { live, conflicts };
+        } else {
+          live.forEach((l) => singleRange.live.add(l));
+          conflicts.forEach((c) => singleRange.conflicts.add(c));
+        }
+        singleRange.live.add(pv);
+        live.forEach((bc) => {
+          const prev = bcToLiveRange.get(bc);
+          (0, import_node_assert10.default)(!prev || prev === lputv);
+          bcToLiveRange.set(bc, lputv);
+        });
+      });
+      (0, import_node_assert10.default)(singleRange && lputv);
+      newRange.set(lputv, singleRange);
+    });
+    splitRanges.set(localid, newRange);
+  });
+  const localInfo = /* @__PURE__ */ new Map();
+  splitRanges.forEach((range) => {
+    range.forEach((v, lputv) => {
+      v.conflicts = new Set(
+        Array.from(v.conflicts).flatMap((bc) => {
+          const r = bcToLiveRange.get(bc);
+          if (!r) {
+            (0, import_node_assert10.default)(bc.arg === 0);
+            return [];
+          }
+          return r;
+        })
+      );
+      localInfo.set(lputv, v);
+    });
+  });
+  localInfo.forEach((info, key) => {
+    info.conflicts.forEach(
+      (v) => localInfo.get(v).conflicts.add(key)
+    );
+  });
+  return localInfo;
+}
+var init_locals = (0, import_chunk_QFQPBQSO.__esm)({
+  "src/readprg/locals.ts"() {
+    "use strict";
+    (0, import_chunk_QFQPBQSO.init_logger)();
     init_bytecode();
     init_cflow();
     init_opcodes();
@@ -22824,9 +23607,9 @@ function blockSharing(func, context) {
   if (!any)
     return false;
   any = false;
-  const logging3 = (0, import_chunk_HHQDDCTP.wouldLog)("sharing", 1);
-  if (logging3 && (0, import_chunk_HHQDDCTP.wouldLog)("sharing", 10)) {
-    (0, import_chunk_HHQDDCTP.setBanner)(functionBanner(func, context, "sharing"));
+  const logging3 = (0, import_chunk_QFQPBQSO.wouldLog)("sharing", 1);
+  if (logging3 && (0, import_chunk_QFQPBQSO.wouldLog)("sharing", 10)) {
+    (0, import_chunk_QFQPBQSO.setBanner)(functionBanner(func, context, "sharing"));
   }
   candidates.forEach((blocks) => {
     while (blocks.size > 1) {
@@ -22962,15 +23745,15 @@ function blockSharing(func, context) {
                 block2.offset
               )})` : `block(${offsetToString(block2.offset)})`;
             };
-            (0, import_chunk_HHQDDCTP.log)(`Sharing ${showBlock(block)} with ${showBlock(target)}`);
-            if ((0, import_chunk_HHQDDCTP.wouldLog)("sharing", 5)) {
-              (0, import_chunk_HHQDDCTP.log)(blockToString(target, context));
+            (0, import_chunk_QFQPBQSO.log)(`Sharing ${showBlock(block)} with ${showBlock(target)}`);
+            if ((0, import_chunk_QFQPBQSO.wouldLog)("sharing", 5)) {
+              (0, import_chunk_QFQPBQSO.log)(blockToString(target, context));
             }
           }
           if (target.bytecodes.length > length2) {
             splitBlock(func, target, -length2);
           }
-          (0, import_node_assert9.default)(block.bytecodes.length >= length2);
+          (0, import_node_assert11.default)(block.bytecodes.length >= length2);
           if (block.bytecodes.length > length2) {
             splitBlock(func, block, block.bytecodes.length - length2);
             const next = block.next;
@@ -22991,28 +23774,43 @@ function blockSharing(func, context) {
       });
     }
   });
-  (0, import_chunk_HHQDDCTP.setBanner)(null);
+  (0, import_chunk_QFQPBQSO.setBanner)(null);
   return any;
 }
-var init_sharing = (0, import_chunk_HHQDDCTP.__esm)({
+var init_sharing = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/sharing.ts"() {
     "use strict";
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_bytecode();
     init_opcodes();
   }
 });
 function optimizeFunc(func, context) {
-  let changes;
-  let liveInState;
-  do {
+  while (true) {
+    let changes;
     cleanCfg2(func, context);
     changes = localDCE(func, context);
-    changes = blockSharing(func, context) || changes;
     changes = simpleOpts(func, context) || changes;
-    ({ liveInState } = interpFunc(func, context));
+    const {
+      liveInState,
+      equivSets,
+      changes: interpChanges
+    } = interpFunc(func, context);
+    changes = interpChanges || changes;
     changes = doArrayInits(func, liveInState, context) || changes;
-  } while (changes);
+    if (changes)
+      continue;
+    changes = blockSharing(func, context) || changes;
+    if (changes)
+      continue;
+    if (context.config.postBuildPRE !== false) {
+      if (sizeBasedPRE2(func, context))
+        continue;
+    }
+    if (!minimizeLocals2(func, equivSets, context) && !changes) {
+      return;
+    }
+  }
 }
 function doArrayInits(func, liveInState, context) {
   const newAToProcess = /* @__PURE__ */ new Map();
@@ -23045,7 +23843,7 @@ function doArrayInits(func, liveInState, context) {
 }
 function simpleOpts(func, context) {
   const equalsSym = 8388787;
-  const logging3 = (0, import_chunk_HHQDDCTP.wouldLog)("optimize", 5);
+  const logging3 = (0, import_chunk_QFQPBQSO.wouldLog)("optimize", 5);
   return Array.from(func.blocks.values()).reduce((changes, block) => {
     for (let i = block.bytecodes.length; i--; ) {
       const cur = block.bytecodes[i];
@@ -23053,7 +23851,7 @@ function simpleOpts(func, context) {
         block.bytecodes.splice(i, 1);
         changes = true;
         if (logging3) {
-          (0, import_chunk_HHQDDCTP.log)(`${func.name}: deleting ${bytecodeToString(cur, null)}`);
+          (0, import_chunk_QFQPBQSO.log)(`${func.name}: deleting ${bytecodeToString(cur, null)}`);
         }
       } else if (i && cur.op === 39 && cur.arg === equalsSym) {
         changes = equalSymbolToEq(block, i) || changes;
@@ -23064,7 +23862,7 @@ function simpleOpts(func, context) {
           if (!shift && prev.op === 37) {
             block.bytecodes.splice(i - 1, 2);
             changes = true;
-            logging3 && (0, import_chunk_HHQDDCTP.log)(`${func.name}: deleting no-op shift (${shift})`);
+            logging3 && (0, import_chunk_QFQPBQSO.log)(`${func.name}: deleting no-op shift (${shift})`);
             continue;
           }
           if (shift < (prev.op === 49 ? 64n : 31n)) {
@@ -23074,7 +23872,7 @@ function simpleOpts(func, context) {
             } else {
               prev.arg = BigInt.asIntN(64, mul);
             }
-            logging3 && (0, import_chunk_HHQDDCTP.log)(
+            logging3 && (0, import_chunk_QFQPBQSO.log)(
               `${func.name}: converting shlv(${shift}) to mulv(${prev.arg})`
             );
             changes = true;
@@ -23089,14 +23887,14 @@ function simpleOpts(func, context) {
         func.blocks.get(block.taken).preds.delete(block.offset);
         delete block.taken;
         changes = true;
-        logging3 && (0, import_chunk_HHQDDCTP.log)(`${func.name}: deleting empty finally handler`);
+        logging3 && (0, import_chunk_QFQPBQSO.log)(`${func.name}: deleting empty finally handler`);
       } else if (isCondBranch(cur.op)) {
         const next = func.blocks.get(block.next);
         const taken = func.blocks.get(block.taken);
         if (next.preds.size > 1 && taken.preds.size === 1) {
           const newOp = cur.op === 40 ? 41 : 40;
           if (logging3) {
-            (0, import_chunk_HHQDDCTP.log)(
+            (0, import_chunk_QFQPBQSO.log)(
               `${func.name}: converting ${Opcodes[cur.op]} to ${Opcodes[newOp]}`
             );
           }
@@ -23109,7 +23907,7 @@ function simpleOpts(func, context) {
           const isBool = i >= 2 && isBoolOp(block.bytecodes[i - 2].op);
           if (next.next === block.taken && next.taken == null && taken.bytecodes.length === 1 && isCondBranch(taken.bytecodes[0].op) && next.bytecodes.length > 1 && next.bytecodes[next.bytecodes.length - 1].op === (cur.op === 41 ? 7 : 8) && (isBool || next.bytecodes.length > 2 && isBoolOp(next.bytecodes[next.bytecodes.length - 2].op)) && next.preds?.size === 1 && taken.preds?.size === 2) {
             if (logging3) {
-              (0, import_chunk_HHQDDCTP.log)(
+              (0, import_chunk_QFQPBQSO.log)(
                 `${func.name}: simplifying ${next.bytecodes[next.bytecodes.length - 1].op === 7 ? "'&&'" : "'||'"} at ${offsetToString(block.offset)}:${offsetToString(
                   next.offset
                 )}:${offsetToString(taken.offset)}:`
@@ -23126,7 +23924,7 @@ function simpleOpts(func, context) {
             changes = true;
           } else if (taken.next === block.next && taken.taken == null && next.bytecodes.length === 1 && isCondBranch(next.bytecodes[0].op) && taken.bytecodes.length > 1 && taken.bytecodes[taken.bytecodes.length - 1].op === (cur.op === 40 ? 7 : 8) && (isBool || taken.bytecodes.length > 2 && isBoolOp(taken.bytecodes[taken.bytecodes.length - 2].op)) && next.preds?.size === 2 && taken.preds?.size === 1) {
             if (logging3) {
-              (0, import_chunk_HHQDDCTP.log)(
+              (0, import_chunk_QFQPBQSO.log)(
                 `${func.name}: simplifying ${taken.bytecodes[taken.bytecodes.length - 1].op === 7 ? "'&&'" : "'||'"} at ${offsetToString(block.offset)}:${offsetToString(
                   taken.offset
                 )}:${offsetToString(next.offset)}:`
@@ -23175,7 +23973,7 @@ function equalSymbolToEq(block, equalsIndex) {
     offset: invokem.offset,
     size: 1
   });
-  (0, import_chunk_HHQDDCTP.logger)(
+  (0, import_chunk_QFQPBQSO.logger)(
     "optimize",
     1,
     `Replacing <thing>.equals(:symbol) with <thing> eq :symbol at ${offsetToString(
@@ -23187,60 +23985,58 @@ function equalSymbolToEq(block, equalsIndex) {
 function isNopBlock(block) {
   return block.bytecodes.length === 0 || block.bytecodes.length === 1 && (block.bytecodes[0].op === 25 || block.bytecodes[0].op === 0);
 }
-function cleanCfg2(func, context) {
-  if ((0, import_chunk_HHQDDCTP.wouldLog)("cfg", 10)) {
-    (0, import_chunk_HHQDDCTP.setBanner)(functionBanner(func, context, "sharing"));
-  }
-  const deadBlocks = /* @__PURE__ */ new Map();
+function removeNoOpBlocks(func) {
+  const noOpBlocks = /* @__PURE__ */ new Map();
   func.blocks.forEach((block) => {
     if (isNopBlock(block) && block.offset !== func.offset) {
-      deadBlocks.set(block.offset, block.next);
+      noOpBlocks.set(block.offset, block.next);
     }
   });
-  if (deadBlocks.size) {
-    deadBlocks.forEach((target, key) => {
-      let next = deadBlocks.get(target);
+  if (noOpBlocks.size) {
+    noOpBlocks.forEach((target, key) => {
+      let next = noOpBlocks.get(target);
       if (next != null) {
         do {
-          deadBlocks.set(key, next);
-          next = deadBlocks.get(next);
+          noOpBlocks.set(key, next);
+          next = noOpBlocks.get(next);
         } while (next);
       }
     });
     func.blocks.forEach((block) => {
       if (block.next) {
-        const fixed = deadBlocks.get(block.next);
+        const fixed = noOpBlocks.get(block.next);
         if (fixed) {
           redirect(func, block, block.next, fixed);
         }
       }
       if (block.taken) {
-        const fixed = deadBlocks.get(block.taken);
+        const fixed = noOpBlocks.get(block.taken);
         if (fixed) {
           redirect(func, block, block.taken, fixed);
         }
       }
       if (block.exsucc) {
-        const fixed = deadBlocks.get(block.exsucc);
+        const fixed = noOpBlocks.get(block.exsucc);
         if (fixed) {
           redirect(func, block, block.exsucc, fixed);
         }
       }
     });
-    deadBlocks.forEach((target, offset) => {
+    noOpBlocks.forEach((target, offset) => {
       removeBlock(func, offset);
     });
   }
-  const deadCatches = /* @__PURE__ */ new Set();
+}
+function removeUnreachableCatches(func, context) {
   func.blocks.forEach((block) => {
     if (block.next && !block.taken && block.next !== block.offset && block.next !== func.offset) {
       const next = func.blocks.get(block.next);
       if (block.try === next.try) {
         if (next.preds.size === 1) {
-          (0, import_chunk_HHQDDCTP.logger)(
+          (0, import_chunk_QFQPBQSO.logger)(
             "cfg",
             1,
-            `${func.name}: ${offsetToString(
+            () => `${func.name}: ${offsetToString(
               block.offset
             )}: Merging linear blocks: ${blockToString(next, context)}`
           );
@@ -23251,7 +24047,7 @@ function cleanCfg2(func, context) {
             addPred(func, next.taken, block.offset);
           }
           if (next.exsucc) {
-            (0, import_node_assert10.default)(!block.exsucc || block.exsucc === next.exsucc);
+            (0, import_node_assert12.default)(!block.exsucc || block.exsucc === next.exsucc);
             if (!block.exsucc) {
               block.exsucc = next.exsucc;
               addPred(func, next.exsucc, block.offset);
@@ -23260,10 +24056,10 @@ function cleanCfg2(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) {
-          (0, import_chunk_HHQDDCTP.logger)(
+          (0, import_chunk_QFQPBQSO.logger)(
             "cfg",
             1,
-            `${func.name}: ${offsetToString(
+            () => `${func.name}: ${offsetToString(
               block.offset
             )}: Merging short fallthrough block: ${blockToString(
               next,
@@ -23285,10 +24081,10 @@ function cleanCfg2(func, context) {
       switch (last.op) {
         case 41:
         case 40:
-          (0, import_chunk_HHQDDCTP.logger)(
+          (0, import_chunk_QFQPBQSO.logger)(
             "cfg",
             1,
-            `${func.name}: killing no-op ${bytecodeToString(
+            () => `${func.name}: killing no-op ${bytecodeToString(
               last,
               context.symbolTable
             )}`
@@ -23301,14 +24097,14 @@ function cleanCfg2(func, context) {
           delete block.taken;
           break;
         default:
-          (0, import_node_assert10.default)(false);
+          (0, import_node_assert12.default)(false);
       }
     }
     if (block.try && !block.exsucc) {
       for (let i = block.try.length; i--; ) {
         const handler = block.try[i].handler;
-        if (!func.blocks.get(handler).preds?.size) {
-          (0, import_chunk_HHQDDCTP.logger)(
+        if (!func.blocks.get(handler)?.preds?.size) {
+          (0, import_chunk_QFQPBQSO.logger)(
             "cfg",
             1,
             `${func.name}: killing unused try-catch at ${offsetToString(
@@ -23316,7 +24112,6 @@ function cleanCfg2(func, context) {
             )} with handler at ${handler}`
           );
           block.try.splice(i, 1);
-          deadCatches.add(handler);
         }
       }
       if (!block.try.length) {
@@ -23324,56 +24119,75 @@ function cleanCfg2(func, context) {
       }
     }
   });
-  deadCatches.forEach((cb) => {
-    const todo = [cb];
-    for (let i = 0; i < todo.length; i++) {
-      const offset = todo[i];
-      const block = func.blocks.get(offset);
-      if (!block) {
-        todo.splice(i--, 1);
-        continue;
-      }
-      if (block.preds?.size) {
-        continue;
-      }
-      if (block.next != null)
-        todo.push(block.next);
-      if (block.taken != null)
-        todo.push(block.taken);
-      if (block.exsucc != null)
-        todo.push(block.exsucc);
-      removeBlock(func, offset);
-      todo.splice(i, 1);
-      i = -1;
-    }
+}
+function cleanCfg2(func, context) {
+  if ((0, import_chunk_QFQPBQSO.wouldLog)("cfg", 10)) {
+    (0, import_chunk_QFQPBQSO.setBanner)(functionBanner(func, context, "sharing"));
+  }
+  removeNoOpBlocks(func);
+  removeUnreachableCatches(func, context);
+  const deadBlocks = new Set(func.blocks.values());
+  postOrderTraverse2(func, (block) => deadBlocks.delete(block));
+  deadBlocks.forEach((block) => {
+    block.next && removePred(func, block.next, block.offset);
+    block.taken && removePred(func, block.taken, block.offset);
+    block.exsucc && removePred(func, block.exsucc, block.offset);
+  });
+  deadBlocks.forEach((block) => {
+    (0, import_node_assert12.default)(!block.preds?.size);
+    func.blocks.delete(block.offset);
   });
-  (0, import_chunk_HHQDDCTP.setBanner)(null);
+  (0, import_chunk_QFQPBQSO.setBanner)(null);
 }
-var init_optimize2 = (0, import_chunk_HHQDDCTP.__esm)({
+var init_optimize2 = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/optimize.ts"() {
     "use strict";
-    (0, import_chunk_HHQDDCTP.init_util)();
+    init_pre2();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_array_init();
     init_bytecode();
     init_dce();
     init_interp2();
+    init_locals();
     init_opcodes();
     init_sharing();
+    init_cflow();
   }
 });
 function emitFunc(func, view, start, updateInfo, context) {
   cleanCfg2(func, context);
   groupBlocks(func);
-  const { offsetMap } = updateInfo;
-  const localsMap = /* @__PURE__ */ new Map();
-  let numArgs = 0;
-  updateInfo.localsMap.set(func, localsMap);
+  const { liveInLocals } = getLocalsInfo(func);
+  const liveLocalRanges = /* @__PURE__ */ new Map();
+  const { localRanges, offsetMap } = updateInfo;
   const linktable = /* @__PURE__ */ new Map();
   let offset = start;
   let lineNum = null;
   const compareLineInfo = (a, b) => {
     return a.line === b.line && a.file === b.file && a.symbol === b.symbol && a.fileStr === b.fileStr && a.symbolStr === b.symbolStr;
   };
+  const startLocalRange = (slot, id, name, isParam) => {
+    const liveRange = liveLocalRanges.get(slot);
+    if (liveRange) {
+      if (liveRange.id === id) {
+        return;
+      }
+      liveRange.endPc = offset - 1;
+      liveLocalRanges.delete(slot);
+    }
+    if (id < 0)
+      return;
+    const newRange = {
+      startPc: offset,
+      endPc: offset,
+      id,
+      isParam,
+      name,
+      slot
+    };
+    liveLocalRanges.set(slot, newRange);
+    localRanges.push(newRange);
+  };
   const exceptionStack = [];
   Array.from(func.blocks.values()).forEach((block, i, blocks) => {
     offsetMap.set(block.offset, offset);
@@ -23402,6 +24216,10 @@ function emitFunc(func, view, start, updateInfo, context) {
     } else {
       exceptionStack.length = 0;
     }
+    const liveInState = liveInLocals.get(block.offset);
+    liveInState?.forEach(
+      (local) => startLocalRange(local.slot, local.id, local.name, local.isParam)
+    );
     block.bytecodes.forEach((bytecode) => {
       if (bytecode.op === 25) {
         return;
@@ -23413,17 +24231,26 @@ function emitFunc(func, view, start, updateInfo, context) {
           updateInfo.lineMap.push(lineNum);
         }
       }
-      offsetMap.set(bytecode.offset, offset);
-      if (bytecode.op === 53) {
-        numArgs = bytecode.arg;
-      } else if (bytecode.op === 19 || bytecode.op === 18) {
-        const li = localsMap.get(bytecode.arg);
-        if (!li) {
-          localsMap.set(bytecode.arg, { startPc: offset, endPc: offset });
+      if (bytecode.op === 19) {
+        const range = bytecode.range;
+        if (range) {
+          startLocalRange(
+            bytecode.arg,
+            range.id,
+            range.name,
+            range.isParam === true
+          );
         } else {
-          li.endPc = offset + bytecode.size;
+          startLocalRange(bytecode.arg, -1, "", false);
         }
       }
+      if (isCondBranch(bytecode.op) && block.taken != null && block.taken === blocks[i + 1]?.offset) {
+        const taken = block.next;
+        block.next = block.taken;
+        block.taken = taken;
+        bytecode.arg = taken;
+        bytecode.op = bytecode.op === 40 ? 41 : 40;
+      }
       offset = emitBytecode(bytecode, view, offset, linktable);
     });
     if (block.next != null && block.next !== blocks[i + 1]?.offset) {
@@ -23436,17 +24263,14 @@ function emitFunc(func, view, start, updateInfo, context) {
       offset = emitBytecode(bc, view, offset, linktable);
     }
   });
-  (0, import_node_assert11.default)(exceptionStack.length === 0);
-  localsMap.forEach((item, slot) => {
-    if (slot < numArgs) {
-      item.startPc = start;
-    }
-    item.endPc = offset;
+  (0, import_node_assert13.default)(exceptionStack.length === 0);
+  liveLocalRanges.forEach((liveRange) => {
+    liveRange.endPc = offset - 1;
   });
   linktable.forEach((target, from) => {
     const newOffset = offsetMap.get(target);
     if (newOffset == null) {
-      (0, import_node_assert11.default)(newOffset != null);
+      (0, import_node_assert13.default)(newOffset != null);
     }
     view.setInt16(from, newOffset - from - 2);
   });
@@ -23490,7 +24314,7 @@ function groupBlocks(func) {
         sortHelper(item).forEach((offset) => itemsFromOffset.set(offset, item));
         itemsToSort.add(item);
         item.items.forEach((block) => {
-          (0, import_node_assert11.default)(!isCfgNode(block));
+          (0, import_node_assert13.default)(!isCfgNode(block));
           if (block.next && itemsFromOffset.get(block.next) !== item) {
             item.succs.add(block.next);
           }
@@ -23526,13 +24350,13 @@ function groupBlocks(func) {
         });
       }
       cur.items.forEach((item) => {
-        (0, import_node_assert11.default)(!isCfgNode(item));
+        (0, import_node_assert13.default)(!isCfgNode(item));
         if (isCfgNode(item)) {
           item.items.forEach((block) => {
-            (0, import_node_assert11.default)(!isCfgNode(block));
+            (0, import_node_assert13.default)(!isCfgNode(block));
             ordered.push(block.offset);
           });
-          (0, import_node_assert11.default)(false);
+          (0, import_node_assert13.default)(false);
         } else {
           ordered.push(item.offset);
         }
@@ -23546,10 +24370,73 @@ function groupBlocks(func) {
     sortHelper(outer).reverse().map((offset) => [offset, func.blocks.get(offset)])
   );
 }
-var init_emit = (0, import_chunk_HHQDDCTP.__esm)({
+function getLocalsInfo(func) {
+  const liveOutLocals = /* @__PURE__ */ new Map();
+  const liveInLocals = /* @__PURE__ */ new Map();
+  function mergeInto3(from, to) {
+    let changed = false;
+    from.forEach((local, key) => {
+      const curr = to.get(key);
+      if (!curr) {
+        to.set(key, local);
+        changed = true;
+        return;
+      }
+    });
+    return changed;
+  }
+  postOrderPropagate(
+    func,
+    (block) => new Map(liveOutLocals.get(block.offset)),
+    (block, bc, locals) => {
+      switch (bc.op) {
+        case 18: {
+          const range = bc.range;
+          if (range) {
+            locals.set(bc.arg, {
+              name: range.name,
+              id: range.id,
+              isParam: range.isParam === true,
+              slot: bc.arg
+            });
+          }
+          break;
+        }
+        case 19:
+          locals.delete(bc.arg);
+          break;
+        case 51:
+        case 15:
+          if (block.exsucc) {
+            const from = liveInLocals.get(block.exsucc);
+            if (from) {
+              mergeInto3(from, locals);
+            }
+          }
+          break;
+      }
+    },
+    (block, locals) => {
+      liveInLocals.set(block.offset, locals);
+    },
+    (locals, predBlock, isExPred) => {
+      if (isExPred)
+        return false;
+      const predLocals = liveOutLocals.get(predBlock.offset);
+      if (!predLocals) {
+        liveOutLocals.set(predBlock.offset, new Map(locals));
+        return true;
+      }
+      return mergeInto3(locals, predLocals);
+    }
+  );
+  return { liveInLocals, liveOutLocals };
+}
+var init_emit = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/emit.ts"() {
     "use strict";
     init_ast();
+    init_cflow();
     init_opcodes();
     init_optimize2();
   }
@@ -23586,13 +24473,13 @@ function fixupExceptions(context, updateInfo) {
   ].view;
   const elems = updateInfo.exceptionsMap.size;
   const sectionLength = 2 + 9 * elems;
-  (0, import_node_assert12.default)(sectionLength <= view.byteLength);
+  (0, import_node_assert14.default)(sectionLength <= view.byteLength);
   view.setUint16(0, elems);
   let writePos = 2;
   updateInfo.exceptionsMap.forEach(
     (entries) => entries.forEach((entry) => {
       const handler = updateInfo.offsetMap.get(entry.handler);
-      (0, import_node_assert12.default)(handler != null);
+      (0, import_node_assert14.default)(handler != null);
       write24(view, (writePos += 3) - 3, entry.tryStart);
       write24(view, (writePos += 3) - 3, entry.tryEnd);
       write24(view, (writePos += 3) - 3, handler);
@@ -23605,7 +24492,7 @@ function write24(view, current, value2) {
   view.setUint8(current + 1, value2 >>> 8);
   view.setUint8(current + 2, value2);
 }
-var init_exceptions = (0, import_chunk_HHQDDCTP.__esm)({
+var init_exceptions = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/exceptions.ts"() {
     "use strict";
     init_bytecode();
@@ -23662,7 +24549,7 @@ function fixupHeader(context, updateInfo) {
     view.setUint32(25, offset);
   }
 }
-var init_header = (0, import_chunk_HHQDDCTP.__esm)({
+var init_header = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/header.ts"() {
     "use strict";
     init_bytecode();
@@ -23769,7 +24656,7 @@ function fixupLineNum(context, updateInfo) {
     });
   });
 }
-var init_linenum = (0, import_chunk_HHQDDCTP.__esm)({
+var init_linenum = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/linenum.ts"() {
     "use strict";
     init_sdk_util();
@@ -23781,13 +24668,77 @@ function offsetToString(offset) {
 }
 function fixSectionSize(section, sections, newSize) {
   const sectionInfo = sections[section];
-  (0, import_node_assert13.default)(sectionInfo);
+  (0, import_node_assert15.default)(sectionInfo);
   const view = sectionInfo.view;
   sectionInfo.length = newSize;
   new DataView(view.buffer, view.byteOffset - 4, 4).setUint32(0, newSize);
   sectionInfo.view = new DataView(view.buffer, view.byteOffset, newSize);
 }
+function markLocals(context) {
+  if (context.debugXml.body instanceof Error) {
+    return;
+  }
+  const localMap = /* @__PURE__ */ new Map();
+  let range = context.nextLocalId;
+  context.debugXml.body.children("localVars").children("entry").elements.forEach((entry) => {
+    const { startPc, endPc, stackId, name, arg } = entry.attr;
+    (0, import_node_assert15.default)(startPc && endPc && stackId && name);
+    const spc = Number(startPc.value.value) & 16777215;
+    const epc = (Number(endPc.value.value) & 16777215) + 1;
+    const sid = Number(stackId.value.value);
+    let locals = localMap.get(spc);
+    if (!locals) {
+      locals = [];
+      localMap.set(spc, locals);
+    }
+    range++;
+    locals.push({
+      name: name.value.value,
+      arg: arg?.value.value === "true",
+      epc,
+      sid,
+      range
+    });
+  });
+  context.nextLocalId = range;
+  const live = /* @__PURE__ */ new Map();
+  const ends = /* @__PURE__ */ new Map();
+  context.bytecodes.forEach((bc) => {
+    const end = ends.get(bc.offset);
+    if (end) {
+      end.forEach((sid) => {
+        (0, import_node_assert15.default)(live.has(sid));
+        live.delete(sid);
+      });
+      ends.delete(bc.offset);
+    }
+    const locals = localMap.get(bc.offset);
+    locals?.forEach((localInfo) => {
+      if (live.has(localInfo.sid)) {
+        (0, import_node_assert15.default)(!live.has(localInfo.sid));
+      }
+      live.set(localInfo.sid, localInfo);
+      const e = ends.get(localInfo.epc);
+      if (e == null) {
+        ends.set(localInfo.epc, [localInfo.sid]);
+      } else {
+        e.push(localInfo.sid);
+      }
+    });
+    if (bc.op === 18 || bc.op === 19) {
+      const local = live.get(bc.arg);
+      if (local) {
+        const range2 = { name: local.name, id: local.range };
+        if (local.arg) {
+          range2.isParam = true;
+        }
+        bc.range = range2;
+      }
+    }
+  });
+}
 function optimizeBytecode(context) {
+  markLocals(context);
   const functions = findFunctions(context);
   const loggerFunc = process.env["MC_LOGGER_FUNC"] ? new RegExp(process.env["MC_LOGGER_FUNC"]) : null;
   const forEachFunction = (callback) => {
@@ -23795,24 +24746,24 @@ function optimizeBytecode(context) {
       functions.forEach(callback);
       return;
     }
-    (0, import_chunk_HHQDDCTP.bumpLogging)(null, 10);
-    functions.forEach((func2) => {
-      if (loggerFunc.test(func2.name ?? "<null>")) {
-        (0, import_chunk_HHQDDCTP.bumpLogging)(null, -10);
-        callback(func2);
-        (0, import_chunk_HHQDDCTP.bumpLogging)(null, 10);
+    (0, import_chunk_QFQPBQSO.bumpLogging)(null, 10);
+    functions.forEach((func) => {
+      if (loggerFunc.test(func.name ?? "<null>")) {
+        (0, import_chunk_QFQPBQSO.bumpLogging)(null, -10);
+        callback(func);
+        (0, import_chunk_QFQPBQSO.bumpLogging)(null, 10);
         return;
       }
-      callback(func2);
+      callback(func);
     });
-    (0, import_chunk_HHQDDCTP.bumpLogging)(null, -10);
+    (0, import_chunk_QFQPBQSO.bumpLogging)(null, -10);
   };
-  if ((0, import_chunk_HHQDDCTP.wouldLog)("list-input", 1)) {
+  if ((0, import_chunk_QFQPBQSO.wouldLog)("list-input", 1)) {
     forEachFunction(
-      (func2) => (0, import_chunk_HHQDDCTP.wouldLog)("list-input", 1) && printFunction(func2, context)
+      (func) => (0, import_chunk_QFQPBQSO.wouldLog)("list-input", 1) && printFunction(func, context)
     );
   }
-  forEachFunction((func2) => optimizeFunc(func2, context));
+  forEachFunction((func) => optimizeFunc(func, context));
   const code = context.sections[
     -1059145026
     /* TEXT */
@@ -23820,23 +24771,23 @@ function optimizeBytecode(context) {
   let offset = 0;
   const updateInfo = {
     offsetMap: /* @__PURE__ */ new Map(),
-    localsMap: /* @__PURE__ */ new Map(),
+    localRanges: [],
     lineMap: [],
     exceptionsMap: /* @__PURE__ */ new Map()
   };
-  forEachFunction((func2) => {
-    if (!func2.name)
+  forEachFunction((func) => {
+    if (!func.name)
       return;
-    (0, import_chunk_HHQDDCTP.logger)(
+    (0, import_chunk_QFQPBQSO.logger)(
       "bytecode",
       5,
-      `${func2.name}: ${offset.toString(16)} ${offset - func2.offset}`
+      `${func.name}: ${offset.toString(16)} ${offset - func.offset}`
     );
-    offset = emitFunc(func2, code, offset, updateInfo, context);
+    offset = emitFunc(func, code, offset, updateInfo, context);
   });
   const { offsetMap } = updateInfo;
   offsetMap.set(code.byteLength, offset);
-  (0, import_chunk_HHQDDCTP.logger)(
+  (0, import_chunk_QFQPBQSO.logger)(
     "bytecode",
     1,
     `${context.filepath}: code size: ${context.sections[
@@ -23848,9 +24799,9 @@ function optimizeBytecode(context) {
     ].length - offset}`
   );
   fixSectionSize(-1059145026, context.sections, offset);
-  if ((0, import_chunk_HHQDDCTP.wouldLog)("list-output", 1)) {
+  if ((0, import_chunk_QFQPBQSO.wouldLog)("list-output", 1)) {
     forEachFunction(
-      (func2) => (0, import_chunk_HHQDDCTP.wouldLog)("list-output", 1) && printFunction(func2, context)
+      (func) => (0, import_chunk_QFQPBQSO.wouldLog)("list-output", 1) && printFunction(func, context)
     );
   }
   fixupHeader(context, updateInfo);
@@ -23861,7 +24812,7 @@ function optimizeBytecode(context) {
     return;
   }
   const funcArray = Array.from(functions.values()).filter(
-    (func2) => func2.name != null
+    (func) => func.name != null
   );
   funcArray.push({ offset: code.byteLength, blocks: /* @__PURE__ */ new Map() });
   const funcIndex = (pc) => {
@@ -23879,46 +24830,53 @@ function optimizeBytecode(context) {
   };
   const funcRange = (pc) => {
     const index = funcIndex(pc);
-    (0, import_node_assert13.default)(
+    (0, import_node_assert15.default)(
       funcArray[index].offset <= (pc & 16777215) && funcArray[index + 1].offset > (pc & 16777215)
     );
     const s = offsetMap.get(funcArray[index].offset);
     const e = offsetMap.get(funcArray[index + 1].offset);
     if (s == null || e == null) {
-      (0, import_node_assert13.default)(s != null && e != null);
+      (0, import_node_assert15.default)(s != null && e != null);
     }
     return [s + 268435456, e + 268435456];
   };
-  let func = funcArray[0];
-  let fend = funcArray[1].offset;
-  context.debugXml.body.children("localVars").children("entry").elements.forEach((entry) => {
-    const { startPc, endPc, stackId } = entry.attr;
-    (0, import_node_assert13.default)(startPc && endPc && stackId);
-    const spc = Number(startPc.value.value) & 16777215;
-    const epc = Number(endPc.value.value) & 16777215;
-    const sid = Number(stackId.value.value);
-    if (spc < func.offset || epc > fend) {
-      const index = funcIndex(Number(startPc.value.value));
-      func = funcArray[index];
-      fend = funcArray[index + 1].offset;
-    }
-    const info = updateInfo.localsMap.get(func);
-    (0, import_node_assert13.default)(info);
-    const local = info.get(sid);
-    if (!local) {
-      entry.attr = {};
+  const localVars = context.debugXml.body.children("localVars");
+  const addAttr = (element, attrName, attrValue) => {
+    element.attr[attrName] = xml_util_exports.makeAttribute(attrName, attrValue);
+  };
+  localVars.elements.forEach((element, i) => {
+    delete element.children;
+    if (i)
       return;
-    }
-    startPc.value.value = (local.startPc + 268435456).toString();
-    endPc.value.value = (local.endPc + 268435455).toString();
+    element.children = [];
+    const children = element.children;
+    updateInfo.localRanges.forEach((localRange) => {
+      if (localRange.endPc === localRange.startPc) {
+        return;
+      }
+      children.push({ type: "chardata", value: "\n" });
+      const element2 = {
+        type: "element",
+        name: "entry",
+        attr: {}
+      };
+      addAttr(element2, "name", localRange.name);
+      if (localRange.isParam) {
+        addAttr(element2, "arg", "true");
+      }
+      addAttr(element2, "startPc", (localRange.startPc + 268435456).toString());
+      addAttr(element2, "endPc", (localRange.endPc + 268435456).toString());
+      addAttr(element2, "stackId", localRange.slot.toString());
+      children.push(element2);
+    });
+    children.push({ type: "chardata", value: "\n" });
   });
-  context.debugXml.body.children("localVars").deleteChildren((entry) => !entry.attr.startPc);
   context.debugXml.body.children("functions").children("functionEntry").elements.forEach((entry) => {
     const { startPc, endPc } = entry.attr;
     if (!startPc || !endPc)
       return;
     const range = funcRange(Number(startPc.value.value));
-    (0, import_node_assert13.default)(funcRange(Number(endPc.value.value))[0] === range[0]);
+    (0, import_node_assert15.default)(funcRange(Number(endPc.value.value))[0] === range[0]);
     startPc.value.value = range[0].toString();
     endPc.value.value = (range[1] - 1).toString();
   });
@@ -23933,7 +24891,7 @@ ${functionToString(
 ---------------- ${func.name} ----------------`;
 }
 function printFunction(func, context) {
-  (0, import_chunk_HHQDDCTP.log)(functionToString(func, context));
+  (0, import_chunk_QFQPBQSO.log)(functionToString(func, context));
 }
 function functionToString(func, context, extra) {
   const parts = [];
@@ -23954,7 +24912,7 @@ function blockToString(block, context) {
   const log2 = (msg) => parts.push(msg + "\n");
   log2(`${offsetToString(block.offset)}:`);
   block.try?.forEach((exInfo) => {
-    (0, import_node_assert13.default)(exInfo);
+    (0, import_node_assert15.default)(exInfo);
     log2(
       `tryCatch - start: ${offsetToString(
         exInfo.tryStart
@@ -23989,6 +24947,12 @@ function lineInfoToString(lineInfo, context) {
 function bytecodeToString(bytecode, symbolTable) {
   let arg = null;
   switch (bytecode.op) {
+    case 18:
+    case 19:
+      if (bytecode.range) {
+        arg = `${bytecode.range.name} ${bytecode.arg}${bytecode.range.isParam ? " (param)" : ""}`;
+      }
+      break;
     case 39: {
       const argSym = symbolTable?.symbolToLabelMap.get(bytecode.arg);
       if (argSym) {
@@ -24002,7 +24966,7 @@ function bytecodeToString(bytecode, symbolTable) {
     case 24: {
       const symbol = symbolTable?.symbols.get(bytecode.arg);
       if (symbol) {
-        arg = symbol.str;
+        arg = `${JSON.stringify(symbol.str)} (${bytecode.arg})`;
       }
       break;
     }
@@ -24109,15 +25073,18 @@ function findFunctions({
       }
       start = i + 1;
       mayThrow2 = false;
-      const exnEntry = exceptionsMap.get(nextBcOffset);
-      if (exnEntry) {
-        exnStack = exnStack.concat(exnEntry);
+      const exnEntries = exceptionsMap.get(nextBcOffset);
+      if (exnEntries) {
+        exnStack = exnStack.concat(
+          exnEntries.filter((exnEntry) => exnEntry.tryEnd > nextBcOffset)
+        );
       }
     }
   });
   const functions = /* @__PURE__ */ new Map();
   while (blocks.size) {
     const func = /* @__PURE__ */ new Map();
+    let argc = null;
     const queue = [blocks.keys().next().value];
     while (queue.length) {
       const next2 = queue.pop();
@@ -24126,11 +25093,13 @@ function findFunctions({
         continue;
       }
       func.set(next2, block);
+      if (func.size === 1 && block.bytecodes.length && block.bytecodes[0].op === 53) {
+        argc = block.bytecodes[0].arg;
+      }
       blocks.delete(next2);
-      exceptionsMap.get(block.offset)?.forEach((exInfo) => {
-        queue.push(exInfo.tryEnd);
-        queue.push(exInfo.handler);
-      });
+      if (block.exsucc != null) {
+        queue.push(block.exsucc);
+      }
       if (block.next != null) {
         queue.push(block.next);
       }
@@ -24141,10 +25110,17 @@ function findFunctions({
     const funcSorted = Array.from(func.keys()).sort((a, b) => a - b).map((key) => [key, func.get(key)]);
     const offset = funcSorted[0][0];
     const f = { offset, blocks: new Map(funcSorted) };
-    const name = symbolTable.methods.get(offset)?.name;
+    const method = symbolTable.methods.get(offset);
+    const name = method?.name;
     if (!name)
       continue;
     f.name = name;
+    if (argc == null && method.argc != null) {
+      argc = method.argc;
+    }
+    if (argc != null) {
+      f.argc = argc;
+    }
     functions.set(offset, f);
   }
   const addPred2 = (func, block, succ) => {
@@ -24179,7 +25155,7 @@ function makeArgless(bc, op) {
 }
 function removeBlock(func, offset) {
   const block = func.blocks.get(offset);
-  (0, import_node_assert13.default)(block && !block.preds?.size);
+  (0, import_node_assert15.default)(block && !block.preds?.size);
   block.next && removePred(func, block.next, block.offset);
   block.taken && removePred(func, block.taken, block.offset);
   block.exsucc && removePred(func, block.exsucc, block.offset);
@@ -24187,9 +25163,7 @@ function removeBlock(func, offset) {
 }
 function removePred(func, target, pred) {
   const targetBlock = func.blocks.get(target);
-  if (!targetBlock.preds?.has(pred)) {
-    (0, import_node_assert13.default)(targetBlock.preds?.has(pred));
-  }
+  (0, import_node_assert15.default)(targetBlock.preds?.has(pred));
   targetBlock.preds.delete(pred);
 }
 function addPred(func, target, pred) {
@@ -24219,7 +25193,7 @@ function redirect(func, block, from, to) {
           last.arg = to;
           break;
         default:
-          (0, import_node_assert13.default)(false);
+          (0, import_node_assert15.default)(false);
       }
     } else {
       delete block.taken;
@@ -24227,8 +25201,8 @@ function redirect(func, block, from, to) {
     changes = true;
   }
   if (block.exsucc === from) {
-    (0, import_node_assert13.default)(to);
-    (0, import_node_assert13.default)(block.try);
+    (0, import_node_assert15.default)(to);
+    (0, import_node_assert15.default)(block.try);
     block.try[block.try.length - 1].handler = to;
     block.exsucc = to;
     changes = true;
@@ -24258,7 +25232,7 @@ function splitBlock(func, block, offset) {
     }
   };
   if (offset > 0) {
-    (0, import_node_assert13.default)(offset < block.bytecodes.length);
+    (0, import_node_assert15.default)(offset < block.bytecodes.length);
     const tail = block.bytecodes.splice(offset);
     const tailBlock = {
       ...block,
@@ -24282,7 +25256,7 @@ function splitBlock(func, block, offset) {
       delete block.taken;
     }
   } else {
-    (0, import_node_assert13.default)(offset < 0 && offset + block.bytecodes.length > 0);
+    (0, import_node_assert15.default)(offset < 0 && offset + block.bytecodes.length > 0);
     const head = block.bytecodes.splice(0, block.bytecodes.length + offset);
     const headBlock = {
       ...block,
@@ -24325,11 +25299,12 @@ function countFallthroughPreds(func, block) {
   }, 0);
 }
 var SectionKinds;
-var init_bytecode = (0, import_chunk_HHQDDCTP.__esm)({
+var init_bytecode = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/bytecode.ts"() {
     "use strict";
     init_ast();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    init_sdk_util();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_data();
     init_emit();
     init_exceptions();
@@ -24365,7 +25340,7 @@ function getPrgSignature(context) {
   if (!signature)
     return;
   const keyInfo = context.key.export({ format: "jwk" });
-  (0, import_node_assert14.default)(keyInfo.n && keyInfo.e);
+  (0, import_node_assert16.default)(keyInfo.n && keyInfo.e);
   const modulusBuf = Buffer.from(keyInfo.n, "base64");
   const publicExponent = Array.from(Buffer.from(keyInfo.e, "base64")).reduce(
     (value2, n) => (value2 << 8) + n,
@@ -24377,7 +25352,7 @@ function getPrgSignature(context) {
     modulusBuf.byteOffset + delta,
     modulusBuf.byteLength - delta
   );
-  (0, import_node_assert14.default)(modulus.byteLength === 512 && signature.length === 512);
+  (0, import_node_assert16.default)(modulus.byteLength === 512 && signature.length === 512);
   const sectionLength = signature.length + modulus.byteLength + 4;
   const buffer = new DataView(new ArrayBuffer(sectionLength + 8));
   buffer.setInt32(
@@ -24440,7 +25415,7 @@ function signView(key, view) {
   signer.end();
   return signer.sign(key);
 }
-var init_signer = (0, import_chunk_HHQDDCTP.__esm)({
+var init_signer = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/signer.ts"() {
     "use strict";
     init_bytecode();
@@ -24454,7 +25429,7 @@ function hash(s) {
   return (h ^ h >>> 9) >>> 0;
 }
 var SymbolTable;
-var init_symbols = (0, import_chunk_HHQDDCTP.__esm)({
+var init_symbols = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg/symbols.ts"() {
     "use strict";
     SymbolTable = class {
@@ -24488,9 +25463,16 @@ var init_symbols = (0, import_chunk_HHQDDCTP.__esm)({
           const { startPc, name, parent } = functionEntry.attr;
           if (!startPc || !name)
             return;
+          const argc = functionEntry.children?.filter(
+            (node) => node.type === "element" && node.name === "param"
+          ).length || null;
           const fullName = (parent ? debugXml.processRefs(parent.value.value) + "." : "") + debugXml.processRefs(name.value.value);
           const pc = Number(startPc.value.value) & 16777215;
-          this.methods.set(pc, { name: fullName, id: null });
+          this.methods.set(pc, {
+            name: fullName,
+            id: null,
+            argc: argc == null ? null : argc + 1
+          });
         });
         debugXml.body.children("symbolTable").children("entry").elements.forEach((entry) => {
           const { id, symbol } = entry.attr;
@@ -24591,20 +25573,20 @@ async function build_project(product, options, lineCallback) {
       lineCallback || ((line) => console.log(line)),
       (line) => console.error(line)
     ];
-    await (0, import_chunk_HHQDDCTP.spawnByLine)(exe, args, handlers, {
+    await (0, import_chunk_QFQPBQSO.spawnByLine)(exe, args, handlers, {
       cwd: workspace
     });
   }
   return { exe, args, program: path.resolve(workspace, program), product };
 }
-var init_build = (0, import_chunk_HHQDDCTP.__esm)({
+var init_build = (0, import_chunk_QFQPBQSO.__esm)({
   "src/build.ts"() {
     "use strict";
     init_sdk_util();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
   }
 });
-var require_ms = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_ms = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/ms/index.js"(exports, module2) {
     var s = 1e3;
     var m = s * 60;
@@ -24718,7 +25700,7 @@ var require_ms = (0, import_chunk_HHQDDCTP.__commonJS)({
     }
   }
 });
-var require_common = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_common = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/debug/src/common.js"(exports, module2) {
     function setup(env) {
       createDebug.debug = createDebug;
@@ -24879,7 +25861,7 @@ var require_common = (0, import_chunk_HHQDDCTP.__commonJS)({
     module2.exports = setup;
   }
 });
-var require_browser = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_browser = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/debug/src/browser.js"(exports, module2) {
     exports.formatArgs = formatArgs;
     exports.save = save;
@@ -25046,7 +26028,7 @@ var require_browser = (0, import_chunk_HHQDDCTP.__commonJS)({
     };
   }
 });
-var require_has_flag = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_has_flag = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/has-flag/index.js"(exports, module2) {
     "use strict";
     module2.exports = (flag, argv = process.argv) => {
@@ -25057,11 +26039,11 @@ var require_has_flag = (0, import_chunk_HHQDDCTP.__commonJS)({
     };
   }
 });
-var require_supports_color = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_supports_color = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/supports-color/index.js"(exports, module2) {
     "use strict";
-    var os2 = (0, import_chunk_HHQDDCTP.__require)("os");
-    var tty = (0, import_chunk_HHQDDCTP.__require)("tty");
+    var os2 = (0, import_chunk_QFQPBQSO.__require)("os");
+    var tty = (0, import_chunk_QFQPBQSO.__require)("tty");
     var hasFlag = require_has_flag();
     var { env } = process;
     var forceColor;
@@ -25157,10 +26139,10 @@ var require_supports_color = (0, import_chunk_HHQDDCTP.__commonJS)({
     };
   }
 });
-var require_node = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_node = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/debug/src/node.js"(exports, module2) {
-    var tty = (0, import_chunk_HHQDDCTP.__require)("tty");
-    var util = (0, import_chunk_HHQDDCTP.__require)("util");
+    var tty = (0, import_chunk_QFQPBQSO.__require)("tty");
+    var util = (0, import_chunk_QFQPBQSO.__require)("util");
     exports.init = init;
     exports.log = log2;
     exports.formatArgs = formatArgs;
@@ -25329,7 +26311,7 @@ var require_node = (0, import_chunk_HHQDDCTP.__commonJS)({
     };
   }
 });
-var require_src = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_src = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/debug/src/index.js"(exports, module2) {
     if (typeof process === "undefined" || process.type === "renderer" || process.browser === true || process.__nwjs) {
       module2.exports = require_browser();
@@ -25338,7 +26320,7 @@ var require_src = (0, import_chunk_HHQDDCTP.__commonJS)({
     }
   }
 });
-var require_wrappy = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_wrappy = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/wrappy/wrappy.js"(exports, module2) {
     module2.exports = wrappy;
     function wrappy(fn, cb) {
@@ -25367,7 +26349,7 @@ var require_wrappy = (0, import_chunk_HHQDDCTP.__commonJS)({
     }
   }
 });
-var require_once = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_once = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/once/once.js"(exports, module2) {
     var wrappy = require_wrappy();
     module2.exports = wrappy(once);
@@ -25410,7 +26392,7 @@ var require_once = (0, import_chunk_HHQDDCTP.__commonJS)({
     }
   }
 });
-var require_end_of_stream = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_end_of_stream = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/end-of-stream/index.js"(exports, module2) {
     var once = require_once();
     var noop = function() {
@@ -25503,11 +26485,11 @@ var require_end_of_stream = (0, import_chunk_HHQDDCTP.__commonJS)({
     module2.exports = eos;
   }
 });
-var require_pump = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_pump = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/pump/index.js"(exports, module2) {
     var once = require_once();
     var eos = require_end_of_stream();
-    var fs9 = (0, import_chunk_HHQDDCTP.__require)("fs");
+    var fs9 = (0, import_chunk_QFQPBQSO.__require)("fs");
     var noop = function() {
     };
     var ancient = /^v?\.0/.test(process.version);
@@ -25585,10 +26567,10 @@ var require_pump = (0, import_chunk_HHQDDCTP.__commonJS)({
     module2.exports = pump;
   }
 });
-var require_buffer_stream = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_buffer_stream = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/get-stream/buffer-stream.js"(exports, module2) {
     "use strict";
-    var { PassThrough: PassThroughStream } = (0, import_chunk_HHQDDCTP.__require)("stream");
+    var { PassThrough: PassThroughStream } = (0, import_chunk_QFQPBQSO.__require)("stream");
     module2.exports = (options) => {
       options = { ...options };
       const { array } = options;
@@ -25628,10 +26610,10 @@ var require_buffer_stream = (0, import_chunk_HHQDDCTP.__commonJS)({
     };
   }
 });
-var require_get_stream = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_get_stream = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/get-stream/index.js"(exports, module2) {
     "use strict";
-    var { constants: BufferConstants } = (0, import_chunk_HHQDDCTP.__require)("buffer");
+    var { constants: BufferConstants } = (0, import_chunk_QFQPBQSO.__require)("buffer");
     var pump = require_pump();
     var bufferStream = require_buffer_stream();
     var MaxBufferError = class extends Error {
@@ -25679,14 +26661,14 @@ var require_get_stream = (0, import_chunk_HHQDDCTP.__commonJS)({
     module2.exports.MaxBufferError = MaxBufferError;
   }
 });
-var require_extract_zip = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_extract_zip = (0, import_chunk_QFQPBQSO.__commonJS)({
   "node_modules/extract-zip/index.js"(exports, module2) {
     var debug = require_src()("extract-zip");
-    var { createWriteStream: createWriteStream2, promises: fs9 } = (0, import_chunk_HHQDDCTP.__require)("fs");
+    var { createWriteStream: createWriteStream2, promises: fs9 } = (0, import_chunk_QFQPBQSO.__require)("fs");
     var getStream = require_get_stream();
-    var path7 = (0, import_chunk_HHQDDCTP.__require)("path");
-    var { promisify } = (0, import_chunk_HHQDDCTP.__require)("util");
-    var stream = (0, import_chunk_HHQDDCTP.__require)("stream");
+    var path7 = (0, import_chunk_QFQPBQSO.__require)("path");
+    var { promisify } = (0, import_chunk_QFQPBQSO.__require)("util");
+    var stream = (0, import_chunk_QFQPBQSO.__require)("stream");
     var yauzl2 = require_yauzl();
     var openZip = promisify(yauzl2.open);
     var pipeline = promisify(stream.pipeline);
@@ -27307,7 +28289,7 @@ function peg$parse2(input, options) {
     );
   }
 }
-var init_jungle = (0, import_chunk_HHQDDCTP.__esm)({
+var init_jungle = (0, import_chunk_QFQPBQSO.__esm)({
   "src/jungle.peggy"() {
     "use strict";
     peg$subclass2(peg$SyntaxError2, Error);
@@ -27532,7 +28514,7 @@ async function checkManifest(manifest, products) {
   });
   return ok;
 }
-var init_manifest = (0, import_chunk_HHQDDCTP.__esm)({
+var init_manifest = (0, import_chunk_QFQPBQSO.__esm)({
   "src/manifest.ts"() {
     "use strict";
     init_sdk_util();
@@ -27788,7 +28770,7 @@ async function resolve_literals(qualifier, default_source, deviceInfo, cache) {
       );
       if (!hasProperty(cache.resolvedPaths, resolved)) {
         if (/[*?[\]{}]/.test(resolved)) {
-          cache.resolvedPaths[resolved] = (0, import_chunk_HHQDDCTP.globSome)(resolved, () => true);
+          cache.resolvedPaths[resolved] = (0, import_chunk_QFQPBQSO.globSome)(resolved, () => true);
         } else {
           cache.resolvedPaths[resolved] = fs5.stat(resolved).then(() => true).catch(() => false);
         }
@@ -27857,12 +28839,12 @@ async function read_resource_files(targets, cache) {
       if (!hasProperty(resourceGroupPromises, key)) {
         resourceGroupPromises[key] = Promise.all(
           p.qualifier.resourcePath.map(
-            (pattern) => (0, import_chunk_HHQDDCTP.globa)(pattern, { mark: true })
+            (pattern) => (0, import_chunk_QFQPBQSO.globa)(pattern, { mark: true })
           )
         ).then(
           (patterns) => Promise.all(
             patterns.flat().map(
-              (path7) => path7.endsWith("/") ? (0, import_chunk_HHQDDCTP.globa)(`${path7}**/*.xml`, { mark: true }) : path7
+              (path7) => path7.endsWith("/") ? (0, import_chunk_QFQPBQSO.globa)(`${path7}**/*.xml`, { mark: true }) : path7
             )
           ).then(
             (paths) => Promise.all(
@@ -27926,7 +28908,7 @@ async function find_build_instructions_in_resource(file, rez, buildDependencies)
   const sourceExcludes = excludes.map((e) => e.file?.value.value).filter((f) => f != null).map((f) => path2.resolve(dir, f).replace(/\\/g, "/"));
   const filePatterns = excludes.map((e) => e.dir?.value.value).filter((f) => f != null).map((f) => path2.join(dir, f, "**", "*.mc").replace(/\\/g, "/"));
   if (filePatterns.length) {
-    const files = (await Promise.all(filePatterns.map((p) => (0, import_chunk_HHQDDCTP.globa)(p)))).flat();
+    const files = (await Promise.all(filePatterns.map((p) => (0, import_chunk_QFQPBQSO.globa)(p)))).flat();
     sourceExcludes.push(...files);
   }
   const excludeAnnotations = excludes.map((e) => e.annotation?.value.value).filter((f) => f != null);
@@ -28077,15 +29059,15 @@ function identify_optimizer_groups(targets, options) {
 function find_barrels(barrelPath) {
   if (Array.isArray(barrelPath)) {
     return Promise.all(
-      barrelPath.map((path7) => (0, import_chunk_HHQDDCTP.globa)(path7, { mark: true }))
+      barrelPath.map((path7) => (0, import_chunk_QFQPBQSO.globa)(path7, { mark: true }))
     ).then((paths) => [
       paths.flat().filter((path7) => path7.endsWith(".jungle")).join(";")
     ]);
   }
-  return (0, import_chunk_HHQDDCTP.globa)(barrelPath, { mark: true }).then(
+  return (0, import_chunk_QFQPBQSO.globa)(barrelPath, { mark: true }).then(
     (paths) => Promise.all(
       paths.map(
-        (path7) => path7.endsWith("/") ? (0, import_chunk_HHQDDCTP.globa)(`${path7}**/*.barrel`) : path7
+        (path7) => path7.endsWith("/") ? (0, import_chunk_QFQPBQSO.globa)(`${path7}**/*.barrel`) : path7
       )
     )
   ).then(
@@ -28333,15 +29315,15 @@ async function get_jungle(jungles, options, resources) {
   return result;
 }
 var import_extract_zip;
-var init_jungles = (0, import_chunk_HHQDDCTP.__esm)({
+var init_jungles = (0, import_chunk_QFQPBQSO.__esm)({
   "src/jungles.ts"() {
     "use strict";
-    import_extract_zip = (0, import_chunk_HHQDDCTP.__toESM)(require_extract_zip());
+    import_extract_zip = (0, import_chunk_QFQPBQSO.__toESM)(require_extract_zip());
     init_jungle();
     init_api();
     init_manifest();
     init_sdk_util();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
   }
 });
 async function launchSimulator(force = true) {
@@ -28399,7 +29381,7 @@ function simulateProgram(prg, device, test = false, logger2) {
     }
   }
   return getSdkPath().then(
-    (sdk) => (0, import_chunk_HHQDDCTP.spawnByLine)(
+    (sdk) => (0, import_chunk_QFQPBQSO.spawnByLine)(
       path3.resolve(sdk, "bin", isWin ? "monkeydo.bat" : "monkeydo"),
       args,
       logger2 || ((line) => console.log(line))
@@ -28408,11 +29390,11 @@ function simulateProgram(prg, device, test = false, logger2) {
     })
   );
 }
-var init_launch = (0, import_chunk_HHQDDCTP.__esm)({
+var init_launch = (0, import_chunk_QFQPBQSO.__esm)({
   "src/launch.ts"() {
     "use strict";
     init_sdk_util();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
   }
 });
 function relative_path_no_dotdot(relative2) {
@@ -28531,7 +29513,7 @@ async function createLocalBarrels(targets, options) {
             optBarrelDir
           };
           return promise2.then(
-            () => (0, import_chunk_HHQDDCTP.copyRecursiveAsNeeded)(
+            () => (0, import_chunk_QFQPBQSO.copyRecursiveAsNeeded)(
               rawBarrelDir,
               optBarrelDir,
               (src) => !src.endsWith(".mc")
@@ -28809,12 +29791,12 @@ async function generateOptimizedProject(options) {
 async function fileInfoFromConfig(workspace, output, buildConfig, extraExcludes) {
   const paths = (await Promise.all(
     buildConfig.sourcePath?.map(
-      (pattern) => (0, import_chunk_HHQDDCTP.globa)(pattern, { cwd: workspace, mark: true })
+      (pattern) => (0, import_chunk_QFQPBQSO.globa)(pattern, { cwd: workspace, mark: true })
     ) || []
   )).flat();
   const files = (await Promise.all(
     paths.map(
-      (path7) => path7.endsWith("/") ? (0, import_chunk_HHQDDCTP.globa)(`${path7}**/*.mc`, { cwd: workspace, mark: true }) : path7
+      (path7) => path7.endsWith("/") ? (0, import_chunk_QFQPBQSO.globa)(`${path7}**/*.mc`, { cwd: workspace, mark: true }) : path7
     )
   )).flat().filter(
     (file) => file.endsWith(".mc") && !path4.relative(workspace, file).startsWith("bin") && (!buildConfig.sourceExcludes || !buildConfig.sourceExcludes.includes(file))
@@ -28897,7 +29879,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
     );
     barrelFnMaps.forEach((barrelFnMap) => Object.assign(fnMap, barrelFnMap));
   }
-  const actualOptimizedFiles = (await (0, import_chunk_HHQDDCTP.globa)(path4.join(output, "**", "*.mc"), { mark: true })).filter((file) => !file.endsWith("/")).sort();
+  const actualOptimizedFiles = (await (0, import_chunk_QFQPBQSO.globa)(path4.join(output, "**", "*.mc"), { mark: true })).filter((file) => !file.endsWith("/")).sort();
   const {
     hasTests,
     diagnostics: prevDiagnostics,
@@ -28908,13 +29890,13 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
   if (hasTests != null && !config.checkBuildPragmas && configOptionsToCheck.every(
     (option) => prevOptions[option] === config[option]
   ) && actualOptimizedFiles.length === Object.values(fnMap).length && Object.values(fnMap).map((v) => v.output).sort().every((f, i) => f === actualOptimizedFiles[i])) {
-    const source_time = await (0, import_chunk_HHQDDCTP.last_modified)(
+    const source_time = await (0, import_chunk_QFQPBQSO.last_modified)(
       Object.keys(fnMap).concat(dependencyFiles)
     );
-    const opt_time = await (0, import_chunk_HHQDDCTP.first_modified)(
+    const opt_time = await (0, import_chunk_QFQPBQSO.first_modified)(
       Object.values(fnMap).map((v) => v.output)
     );
-    if (source_time < opt_time && 1680119325581 < opt_time) {
+    if (source_time < opt_time && 1680389221493 < opt_time) {
       return { hasTests, diagnostics: prevDiagnostics };
     }
   }
@@ -28946,7 +29928,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
           JSON.stringify({
             hasTests: hasTests2,
             diagnostics,
-            optimizerVersion: "1.1.22",
+            optimizerVersion: "1.1.24",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -29091,7 +30073,7 @@ async function generateApiMirTests(options) {
   return fs6.writeFile(`${workspace}/source/apiTest.mc`, source);
 }
 var defaultConfig, configOptionsToCheck;
-var init_optimizer = (0, import_chunk_HHQDDCTP.__esm)({
+var init_optimizer = (0, import_chunk_QFQPBQSO.__esm)({
   "src/optimizer.ts"() {
     init_api();
     init_build();
@@ -29104,7 +30086,7 @@ var init_optimizer = (0, import_chunk_HHQDDCTP.__esm)({
     init_could_be();
     init_interp();
     init_sub_type();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_worker_pool();
     init_optimizer_types();
     init_types();
@@ -29145,7 +30127,7 @@ async function performTask(task) {
   return handler(task.data);
 }
 var workerTaskHandlers;
-var init_worker_task = (0, import_chunk_HHQDDCTP.__esm)({
+var init_worker_task = (0, import_chunk_QFQPBQSO.__esm)({
   "src/worker-task.ts"() {
     "use strict";
     init_optimizer();
@@ -29225,7 +30207,7 @@ function runTaskInPool(task) {
   return performTask(task);
 }
 var kTaskInfo, kWorkerFreedEvent, WorkerPoolTaskInfo, WorkerPool, pool;
-var init_worker_pool = (0, import_chunk_HHQDDCTP.__esm)({
+var init_worker_pool = (0, import_chunk_QFQPBQSO.__esm)({
   "src/worker-pool.ts"() {
     "use strict";
     init_worker_task();
@@ -29368,7 +30350,7 @@ async function optimizeProgram(filepath, devKey, output, config) {
 }
 function optimizeProgramBuffer(filepath, view, debugXml, key, config) {
   const { sections } = readPrgWithOffsets(view);
-  (0, import_chunk_HHQDDCTP.logger)("readprg", 5, sections);
+  (0, import_chunk_QFQPBQSO.logger)("readprg", 5, sections);
   const symbolTable = new SymbolTable();
   if (hasProperty(sections, 1461170197 .toString())) {
     symbolTable.parse(sections[
@@ -29410,7 +30392,8 @@ function optimizeProgramBuffer(filepath, view, debugXml, key, config) {
     exceptionsMap,
     key,
     debugXml,
-    nextOffset: (bytecodes[bytecodes.length - 1]?.offset ?? 0) + (bytecodes[bytecodes.length - 1]?.size ?? 0)
+    nextOffset: (bytecodes[bytecodes.length - 1]?.offset ?? 0) + (bytecodes[bytecodes.length - 1]?.size ?? 0),
+    nextLocalId: 0
   };
   optimizeBytecode(context);
   const signature = getPrgSignature(context);
@@ -29640,11 +30623,11 @@ function optimizePrgAndDebug(prgName, prgBuffer, prgOffset, prgLength, xmlName,
   });
 }
 var yauzl, yazl;
-var init_readprg = (0, import_chunk_HHQDDCTP.__esm)({
+var init_readprg = (0, import_chunk_QFQPBQSO.__esm)({
   "src/readprg.ts"() {
     "use strict";
-    yauzl = (0, import_chunk_HHQDDCTP.__toESM)(require_yauzl());
-    yazl = (0, import_chunk_HHQDDCTP.__toESM)(require_yazl());
+    yauzl = (0, import_chunk_QFQPBQSO.__toESM)(require_yauzl());
+    yazl = (0, import_chunk_QFQPBQSO.__toESM)(require_yazl());
     init_ast();
     init_bytecode();
     init_data();
@@ -29655,7 +30638,7 @@ var init_readprg = (0, import_chunk_HHQDDCTP.__esm)({
     init_signer();
     init_symbols();
     init_sdk_util();
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_worker_pool();
   }
 });
@@ -29667,7 +30650,7 @@ function getSdkPath() {
   });
 }
 async function getDeviceInfo() {
-  const files = await (0, import_chunk_HHQDDCTP.globa)(`${connectiq}/Devices/*/compiler.json`);
+  const files = await (0, import_chunk_QFQPBQSO.globa)(`${connectiq}/Devices/*/compiler.json`);
   if (!files.length) {
     throw new Error(
       `No devices found at '${connectiq}/Devices'. Check your sdk is correctly installed`
@@ -29732,9 +30715,9 @@ async function getFunctionDocumentation() {
   return entries;
 }
 var isWin, appSupport, connectiq;
-var init_sdk_util = (0, import_chunk_HHQDDCTP.__esm)({
+var init_sdk_util = (0, import_chunk_QFQPBQSO.__esm)({
   "src/sdk-util.ts"() {
-    (0, import_chunk_HHQDDCTP.init_util)();
+    (0, import_chunk_QFQPBQSO.init_util)();
     init_xml_util();
     init_readprg();
     init_bytecode();