@markw65/monkeyc-optimizer 1.1.24 → 1.1.25

package/README.md

@@ -843,3 +843,8 @@ No functional change, just fixes a typo that broke the typescript exports.
     - Conditional branches that are known to be taken, or known to be not taken are converted to gotos (and the gotos will often be eliminated by re-ordering blocks)
     - Conditional branches that would be known to be taken, or known to be not taken if evalated at the end of one of their predecessors will be bypassed from that predecessor. Amongst other things, this converts for and while loops, that can be proven to iterate at least once, into do-while loops.
   - Improved the emitter's algorithm for ordering blocks to avoid some more gotos
+
+### 1.1.25
+
+- Bug fixes
+  - fixes a copy paste error that could cause strange results in the interpreter, possibly leading to incorrect optimizations.

package/build/api.cjs

@@ -18,42 +18,42 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_3HVXWNU4.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_3HVXWNU4.collectNamespaces,
-  createDocumentationMap: () => import_chunk_3HVXWNU4.createDocumentationMap,
-  diagnostic: () => import_chunk_3HVXWNU4.diagnostic,
-  diagnosticHelper: () => import_chunk_3HVXWNU4.diagnosticHelper,
-  findNamesInScope: () => import_chunk_3HVXWNU4.findNamesInScope,
-  findUsingForNode: () => import_chunk_3HVXWNU4.findUsingForNode,
-  formatAst: () => import_chunk_3HVXWNU4.formatAst,
-  formatAstLongLines: () => import_chunk_3HVXWNU4.formatAstLongLines,
-  getApiFunctionInfo: () => import_chunk_3HVXWNU4.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_3HVXWNU4.getApiMapping,
-  getSuperClasses: () => import_chunk_3HVXWNU4.getSuperClasses,
-  hasProperty: () => import_chunk_3HVXWNU4.hasProperty,
-  isClassVariable: () => import_chunk_3HVXWNU4.isClassVariable,
-  isLocal: () => import_chunk_3HVXWNU4.isLocal,
-  isLookupCandidate: () => import_chunk_3HVXWNU4.isLookupCandidate,
-  isStateNode: () => import_chunk_3HVXWNU4.isStateNode,
-  lookupByFullName: () => import_chunk_3HVXWNU4.lookupByFullName,
-  lookupNext: () => import_chunk_3HVXWNU4.lookupNext,
-  lookupResultContains: () => import_chunk_3HVXWNU4.lookupResultContains,
-  lookupWithType: () => import_chunk_3HVXWNU4.lookupWithType,
-  makeToyboxLink: () => import_chunk_3HVXWNU4.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_3HVXWNU4.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_3HVXWNU4.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_3HVXWNU4.parseSdkVersion,
-  sameLookupResult: () => import_chunk_3HVXWNU4.sameLookupResult,
-  traverseAst: () => import_chunk_3HVXWNU4.traverseAst,
-  variableDeclarationName: () => import_chunk_3HVXWNU4.variableDeclarationName,
-  visitReferences: () => import_chunk_3HVXWNU4.visitReferences,
-  visit_resources: () => import_chunk_3HVXWNU4.visit_resources,
-  visitorNode: () => import_chunk_3HVXWNU4.visitorNode
+  checkCompilerVersion: () => import_chunk_SNWJ2FZL.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_SNWJ2FZL.collectNamespaces,
+  createDocumentationMap: () => import_chunk_SNWJ2FZL.createDocumentationMap,
+  diagnostic: () => import_chunk_SNWJ2FZL.diagnostic,
+  diagnosticHelper: () => import_chunk_SNWJ2FZL.diagnosticHelper,
+  findNamesInScope: () => import_chunk_SNWJ2FZL.findNamesInScope,
+  findUsingForNode: () => import_chunk_SNWJ2FZL.findUsingForNode,
+  formatAst: () => import_chunk_SNWJ2FZL.formatAst,
+  formatAstLongLines: () => import_chunk_SNWJ2FZL.formatAstLongLines,
+  getApiFunctionInfo: () => import_chunk_SNWJ2FZL.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_SNWJ2FZL.getApiMapping,
+  getSuperClasses: () => import_chunk_SNWJ2FZL.getSuperClasses,
+  hasProperty: () => import_chunk_SNWJ2FZL.hasProperty,
+  isClassVariable: () => import_chunk_SNWJ2FZL.isClassVariable,
+  isLocal: () => import_chunk_SNWJ2FZL.isLocal,
+  isLookupCandidate: () => import_chunk_SNWJ2FZL.isLookupCandidate,
+  isStateNode: () => import_chunk_SNWJ2FZL.isStateNode,
+  lookupByFullName: () => import_chunk_SNWJ2FZL.lookupByFullName,
+  lookupNext: () => import_chunk_SNWJ2FZL.lookupNext,
+  lookupResultContains: () => import_chunk_SNWJ2FZL.lookupResultContains,
+  lookupWithType: () => import_chunk_SNWJ2FZL.lookupWithType,
+  makeToyboxLink: () => import_chunk_SNWJ2FZL.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_SNWJ2FZL.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_SNWJ2FZL.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_SNWJ2FZL.parseSdkVersion,
+  sameLookupResult: () => import_chunk_SNWJ2FZL.sameLookupResult,
+  traverseAst: () => import_chunk_SNWJ2FZL.traverseAst,
+  variableDeclarationName: () => import_chunk_SNWJ2FZL.variableDeclarationName,
+  visitReferences: () => import_chunk_SNWJ2FZL.visitReferences,
+  visit_resources: () => import_chunk_SNWJ2FZL.visit_resources,
+  visitorNode: () => import_chunk_SNWJ2FZL.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_3HVXWNU4 = require("./chunk-3HVXWNU4.cjs");
+var import_chunk_SNWJ2FZL = require("./chunk-SNWJ2FZL.cjs");
 var import_chunk_QFQPBQSO = require("./chunk-QFQPBQSO.cjs");
-(0, import_chunk_3HVXWNU4.init_api)();
+(0, import_chunk_SNWJ2FZL.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-3HVXWNU4.cjs → chunk-SNWJ2FZL.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_3HVXWNU4_exports = {};
-__export(chunk_3HVXWNU4_exports, {
+var chunk_SNWJ2FZL_exports = {};
+__export(chunk_SNWJ2FZL_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -125,7 +125,7 @@ __export(chunk_3HVXWNU4_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_3HVXWNU4_exports);
+module.exports = __toCommonJS(chunk_SNWJ2FZL_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"));
@@ -22210,7 +22210,7 @@ function interpBytecode(bc, localState, context) {
     }
     case 24: {
       const symbol = context.symbolTable?.symbols.get(bc.arg);
-      xpush(131072, symbol?.str);
+      xpush(256, symbol?.str);
       break;
     }
     case 3:
@@ -22344,6 +22344,17 @@ function interpFunc(func, context) {
       return cloneState2(liveInState.get(block.offset));
     },
     (block, bc, localState) => {
+      if (interpLogging) {
+        if ((0, import_chunk_QFQPBQSO.wouldLog)("interp", 8)) {
+          (0, import_chunk_QFQPBQSO.log)(
+            `${interpStateToString(localState)}
+    ${bytecodeToString(
+              bc,
+              context.symbolTable
+            )}`
+          );
+        }
+      }
       switch (bc.op) {
         case 19: {
           selfStores.delete(bc);
@@ -29896,7 +29907,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
     const opt_time = await (0, import_chunk_QFQPBQSO.first_modified)(
       Object.values(fnMap).map((v) => v.output)
     );
-    if (source_time < opt_time && 1680389221493 < opt_time) {
+    if (source_time < opt_time && 1680477048993 < opt_time) {
       return { hasTests, diagnostics: prevDiagnostics };
     }
   }
@@ -29928,7 +29939,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
           JSON.stringify({
             hasTests: hasTests2,
             diagnostics,
-            optimizerVersion: "1.1.24",
+            optimizerVersion: "1.1.25",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )

package/build/optimizer.cjs

@@ -18,27 +18,27 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_3HVXWNU4.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_3HVXWNU4.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_SNWJ2FZL.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_SNWJ2FZL.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_QFQPBQSO.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_3HVXWNU4.defaultConfig,
-  display: () => import_chunk_3HVXWNU4.display,
-  generateApiMirTests: () => import_chunk_3HVXWNU4.generateApiMirTests,
-  generateOneConfig: () => import_chunk_3HVXWNU4.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_3HVXWNU4.generateOptimizedProject,
-  getConfig: () => import_chunk_3HVXWNU4.getConfig,
-  getProjectAnalysis: () => import_chunk_3HVXWNU4.getProjectAnalysis,
-  get_jungle: () => import_chunk_3HVXWNU4.get_jungle,
-  isErrorWithLocation: () => import_chunk_3HVXWNU4.isErrorWithLocation,
-  launchSimulator: () => import_chunk_3HVXWNU4.launchSimulator,
-  manifestProducts: () => import_chunk_3HVXWNU4.manifestProducts,
-  mctree: () => import_chunk_3HVXWNU4.mctree,
-  simulateProgram: () => import_chunk_3HVXWNU4.simulateProgram
+  defaultConfig: () => import_chunk_SNWJ2FZL.defaultConfig,
+  display: () => import_chunk_SNWJ2FZL.display,
+  generateApiMirTests: () => import_chunk_SNWJ2FZL.generateApiMirTests,
+  generateOneConfig: () => import_chunk_SNWJ2FZL.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_SNWJ2FZL.generateOptimizedProject,
+  getConfig: () => import_chunk_SNWJ2FZL.getConfig,
+  getProjectAnalysis: () => import_chunk_SNWJ2FZL.getProjectAnalysis,
+  get_jungle: () => import_chunk_SNWJ2FZL.get_jungle,
+  isErrorWithLocation: () => import_chunk_SNWJ2FZL.isErrorWithLocation,
+  launchSimulator: () => import_chunk_SNWJ2FZL.launchSimulator,
+  manifestProducts: () => import_chunk_SNWJ2FZL.manifestProducts,
+  mctree: () => import_chunk_SNWJ2FZL.mctree,
+  simulateProgram: () => import_chunk_SNWJ2FZL.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_3HVXWNU4 = require("./chunk-3HVXWNU4.cjs");
+var import_chunk_SNWJ2FZL = require("./chunk-SNWJ2FZL.cjs");
 var import_chunk_QFQPBQSO = require("./chunk-QFQPBQSO.cjs");
-(0, import_chunk_3HVXWNU4.init_optimizer)();
+(0, import_chunk_SNWJ2FZL.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,

package/build/sdk-util.cjs

@@ -18,23 +18,23 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var sdk_util_exports = {};
 __export(sdk_util_exports, {
-  SectionKinds: () => import_chunk_3HVXWNU4.SectionKinds,
-  appSupport: () => import_chunk_3HVXWNU4.appSupport,
-  connectiq: () => import_chunk_3HVXWNU4.connectiq,
-  getDeviceInfo: () => import_chunk_3HVXWNU4.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_3HVXWNU4.getFunctionDocumentation,
-  getLanguages: () => import_chunk_3HVXWNU4.getLanguages,
-  getSdkPath: () => import_chunk_3HVXWNU4.getSdkPath,
-  isWin: () => import_chunk_3HVXWNU4.isWin,
-  optimizeProgram: () => import_chunk_3HVXWNU4.optimizeProgram,
-  readPrg: () => import_chunk_3HVXWNU4.readPrg,
-  readPrgWithOffsets: () => import_chunk_3HVXWNU4.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_3HVXWNU4.xml_util_exports
+  SectionKinds: () => import_chunk_SNWJ2FZL.SectionKinds,
+  appSupport: () => import_chunk_SNWJ2FZL.appSupport,
+  connectiq: () => import_chunk_SNWJ2FZL.connectiq,
+  getDeviceInfo: () => import_chunk_SNWJ2FZL.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_SNWJ2FZL.getFunctionDocumentation,
+  getLanguages: () => import_chunk_SNWJ2FZL.getLanguages,
+  getSdkPath: () => import_chunk_SNWJ2FZL.getSdkPath,
+  isWin: () => import_chunk_SNWJ2FZL.isWin,
+  optimizeProgram: () => import_chunk_SNWJ2FZL.optimizeProgram,
+  readPrg: () => import_chunk_SNWJ2FZL.readPrg,
+  readPrgWithOffsets: () => import_chunk_SNWJ2FZL.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_SNWJ2FZL.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_3HVXWNU4 = require("./chunk-3HVXWNU4.cjs");
+var import_chunk_SNWJ2FZL = require("./chunk-SNWJ2FZL.cjs");
 var import_chunk_QFQPBQSO = require("./chunk-QFQPBQSO.cjs");
-(0, import_chunk_3HVXWNU4.init_sdk_util)();
+(0, import_chunk_SNWJ2FZL.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/worker-thread.cjs

@@ -21,15 +21,15 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_3HVXWNU4 = require("./chunk-3HVXWNU4.cjs");
+var import_chunk_SNWJ2FZL = require("./chunk-SNWJ2FZL.cjs");
 var import_chunk_QFQPBQSO = require("./chunk-QFQPBQSO.cjs");
 var import_node_worker_threads = require("node:worker_threads");
 var require_worker_thread = (0, import_chunk_QFQPBQSO.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_3HVXWNU4.init_worker_task)();
+    (0, import_chunk_SNWJ2FZL.init_worker_task)();
     if (import_node_worker_threads.parentPort) {
       import_node_worker_threads.parentPort.on("message", async (task) => {
-        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_3HVXWNU4.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_SNWJ2FZL.performTask)(task));
       });
     }
   }

package/package.json

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