@markw65/monkeyc-optimizer 1.1.19 → 1.1.20

package/README.md

@@ -784,3 +784,12 @@ Bug Fixes
   - better optimization for arrays whose elements are all initialized to the same value (eg `[42, 42, 42, 42]`)
   - more efficient tests for symbols in case statements (ie `case: :foo`)
   - parallelize the post build optimizer when exporting a project
+
+### 1.1.20
+
+- Bug fixes
+
+  - Fix a bug that could cause the optimizer to incorrectly substitute one local for another.
+
+- Optimizations
+  - Improve dce in the post build optimizer a little, by computing which locals are live out of each block.

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_O5LFMOIG.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_O5LFMOIG.collectNamespaces,
-  createDocumentationMap: () => import_chunk_O5LFMOIG.createDocumentationMap,
-  diagnostic: () => import_chunk_O5LFMOIG.diagnostic,
-  diagnosticHelper: () => import_chunk_O5LFMOIG.diagnosticHelper,
-  findNamesInScope: () => import_chunk_O5LFMOIG.findNamesInScope,
-  findUsingForNode: () => import_chunk_O5LFMOIG.findUsingForNode,
-  formatAst: () => import_chunk_O5LFMOIG.formatAst,
-  formatAstLongLines: () => import_chunk_O5LFMOIG.formatAstLongLines,
-  getApiFunctionInfo: () => import_chunk_O5LFMOIG.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_O5LFMOIG.getApiMapping,
-  getSuperClasses: () => import_chunk_O5LFMOIG.getSuperClasses,
-  hasProperty: () => import_chunk_O5LFMOIG.hasProperty,
-  isClassVariable: () => import_chunk_O5LFMOIG.isClassVariable,
-  isLocal: () => import_chunk_O5LFMOIG.isLocal,
-  isLookupCandidate: () => import_chunk_O5LFMOIG.isLookupCandidate,
-  isStateNode: () => import_chunk_O5LFMOIG.isStateNode,
-  lookupByFullName: () => import_chunk_O5LFMOIG.lookupByFullName,
-  lookupNext: () => import_chunk_O5LFMOIG.lookupNext,
-  lookupResultContains: () => import_chunk_O5LFMOIG.lookupResultContains,
-  lookupWithType: () => import_chunk_O5LFMOIG.lookupWithType,
-  makeToyboxLink: () => import_chunk_O5LFMOIG.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_O5LFMOIG.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_O5LFMOIG.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_O5LFMOIG.parseSdkVersion,
-  sameLookupResult: () => import_chunk_O5LFMOIG.sameLookupResult,
-  traverseAst: () => import_chunk_O5LFMOIG.traverseAst,
-  variableDeclarationName: () => import_chunk_O5LFMOIG.variableDeclarationName,
-  visitReferences: () => import_chunk_O5LFMOIG.visitReferences,
-  visit_resources: () => import_chunk_O5LFMOIG.visit_resources,
-  visitorNode: () => import_chunk_O5LFMOIG.visitorNode
+  checkCompilerVersion: () => import_chunk_DCGJCC63.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_DCGJCC63.collectNamespaces,
+  createDocumentationMap: () => import_chunk_DCGJCC63.createDocumentationMap,
+  diagnostic: () => import_chunk_DCGJCC63.diagnostic,
+  diagnosticHelper: () => import_chunk_DCGJCC63.diagnosticHelper,
+  findNamesInScope: () => import_chunk_DCGJCC63.findNamesInScope,
+  findUsingForNode: () => import_chunk_DCGJCC63.findUsingForNode,
+  formatAst: () => import_chunk_DCGJCC63.formatAst,
+  formatAstLongLines: () => import_chunk_DCGJCC63.formatAstLongLines,
+  getApiFunctionInfo: () => import_chunk_DCGJCC63.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_DCGJCC63.getApiMapping,
+  getSuperClasses: () => import_chunk_DCGJCC63.getSuperClasses,
+  hasProperty: () => import_chunk_DCGJCC63.hasProperty,
+  isClassVariable: () => import_chunk_DCGJCC63.isClassVariable,
+  isLocal: () => import_chunk_DCGJCC63.isLocal,
+  isLookupCandidate: () => import_chunk_DCGJCC63.isLookupCandidate,
+  isStateNode: () => import_chunk_DCGJCC63.isStateNode,
+  lookupByFullName: () => import_chunk_DCGJCC63.lookupByFullName,
+  lookupNext: () => import_chunk_DCGJCC63.lookupNext,
+  lookupResultContains: () => import_chunk_DCGJCC63.lookupResultContains,
+  lookupWithType: () => import_chunk_DCGJCC63.lookupWithType,
+  makeToyboxLink: () => import_chunk_DCGJCC63.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_DCGJCC63.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_DCGJCC63.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_DCGJCC63.parseSdkVersion,
+  sameLookupResult: () => import_chunk_DCGJCC63.sameLookupResult,
+  traverseAst: () => import_chunk_DCGJCC63.traverseAst,
+  variableDeclarationName: () => import_chunk_DCGJCC63.variableDeclarationName,
+  visitReferences: () => import_chunk_DCGJCC63.visitReferences,
+  visit_resources: () => import_chunk_DCGJCC63.visit_resources,
+  visitorNode: () => import_chunk_DCGJCC63.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_O5LFMOIG = require("./chunk-O5LFMOIG.cjs");
-var import_chunk_IAUHYWVN = require("./chunk-IAUHYWVN.cjs");
-(0, import_chunk_O5LFMOIG.init_api)();
+var import_chunk_DCGJCC63 = require("./chunk-DCGJCC63.cjs");
+var import_chunk_APACX34C = require("./chunk-APACX34C.cjs");
+(0, import_chunk_DCGJCC63.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-IAUHYWVN.cjs → chunk-APACX34C.cjs}

@@ -26,8 +26,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_IAUHYWVN_exports = {};
-__export(chunk_IAUHYWVN_exports, {
+var chunk_APACX34C_exports = {};
+__export(chunk_APACX34C_exports, {
+  GenericQueue: () => GenericQueue,
   __commonJS: () => __commonJS,
   __esm: () => __esm,
   __export: () => __export2,
@@ -56,7 +57,7 @@ __export(chunk_IAUHYWVN_exports, {
   spawnByLine: () => spawnByLine,
   wouldLog: () => wouldLog
 });
-module.exports = __toCommonJS(chunk_IAUHYWVN_exports);
+module.exports = __toCommonJS(chunk_APACX34C_exports);
 var child_process = __toESM(require("child_process"));
 var fsc = __toESM(require("fs"));
 var fs = __toESM(require("fs/promises"));
@@ -5372,6 +5373,85 @@ var require_out4 = __commonJS({
     module2.exports = FastGlob;
   }
 });
+var require_priorityqueuejs = __commonJS({
+  "node_modules/priorityqueuejs/index.js"(exports, module2) {
+    module2.exports = PriorityQueue2;
+    function PriorityQueue2(comparator) {
+      this._comparator = comparator || PriorityQueue2.DEFAULT_COMPARATOR;
+      this._elements = [];
+    }
+    PriorityQueue2.DEFAULT_COMPARATOR = function(a, b) {
+      if (typeof a === "number" && typeof b === "number") {
+        return a - b;
+      } else {
+        a = a.toString();
+        b = b.toString();
+        if (a == b)
+          return 0;
+        return a > b ? 1 : -1;
+      }
+    };
+    PriorityQueue2.prototype.isEmpty = function() {
+      return this.size() === 0;
+    };
+    PriorityQueue2.prototype.peek = function() {
+      if (this.isEmpty())
+        throw new Error("PriorityQueue is empty");
+      return this._elements[0];
+    };
+    PriorityQueue2.prototype.deq = function() {
+      var first = this.peek();
+      var last = this._elements.pop();
+      var size = this.size();
+      if (size === 0)
+        return first;
+      this._elements[0] = last;
+      var current = 0;
+      while (current < size) {
+        var largest = current;
+        var left = 2 * current + 1;
+        var right = 2 * current + 2;
+        if (left < size && this._compare(left, largest) >= 0) {
+          largest = left;
+        }
+        if (right < size && this._compare(right, largest) >= 0) {
+          largest = right;
+        }
+        if (largest === current)
+          break;
+        this._swap(largest, current);
+        current = largest;
+      }
+      return first;
+    };
+    PriorityQueue2.prototype.enq = function(element) {
+      var size = this._elements.push(element);
+      var current = size - 1;
+      while (current > 0) {
+        var parent = Math.floor((current - 1) / 2);
+        if (this._compare(current, parent) <= 0)
+          break;
+        this._swap(parent, current);
+        current = parent;
+      }
+      return size;
+    };
+    PriorityQueue2.prototype.size = function() {
+      return this._elements.length;
+    };
+    PriorityQueue2.prototype.forEach = function(fn) {
+      return this._elements.forEach(fn);
+    };
+    PriorityQueue2.prototype._compare = function(a, b) {
+      return this._comparator(this._elements[a], this._elements[b]);
+    };
+    PriorityQueue2.prototype._swap = function(a, b) {
+      var aux = this._elements[a];
+      this._elements[a] = this._elements[b];
+      this._elements[b] = aux;
+    };
+  }
+});
 function logger(module2, level, message) {
   if (wouldLog(module2, level)) {
     log(message);
@@ -5630,11 +5710,33 @@ function popcount(x) {
   x += x >> 16;
   return x & 127;
 }
-var import_fast_glob;
+var import_fast_glob, import_priorityqueuejs, GenericQueue;
 var init_util = __esm({
   "src/util.ts"() {
     import_fast_glob = __toESM2(require_out4());
+    import_priorityqueuejs = __toESM2(require_priorityqueuejs());
     init_logger();
+    GenericQueue = class {
+      enqueued = /* @__PURE__ */ new Set();
+      queue;
+      constructor(sort) {
+        this.queue = new import_priorityqueuejs.default(sort);
+      }
+      enqueue(block) {
+        if (!this.enqueued.has(block)) {
+          this.enqueued.add(block);
+          this.queue.enq(block);
+        }
+      }
+      dequeue() {
+        const block = this.queue.deq();
+        this.enqueued.delete(block);
+        return block;
+      }
+      empty() {
+        return this.queue.isEmpty();
+      }
+    };
   }
 });
 /*! Bundled license information:
@@ -5687,6 +5789,7 @@ run-parallel/index.js:
 */
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  GenericQueue,
   __commonJS,
   __esm,
   __export,