@markw65/monkeyc-optimizer 1.0.31 → 1.0.32

package/README.md

@@ -378,3 +378,9 @@ Bug Fixes
   - Collect info about what each function may modify and call
   - Better analysis of inline function bodies
   - Update the StateNodeDecls when renaming locals
+
+### 1.0.32
+
+- Bug fixes
+  - Fixup the tests to run unoptimized again, and add running unoptimized to the standard test run
+  - Fix PRE to not merge Numbers and Floats (ie 1 is not the same thing as 1.0), and add a test

package/build/api.cjs

@@ -1980,6 +1980,7 @@ var priorityqueuejs = __webpack_require__(2789);
 
 
 
+
 /**
  * This implements a pseudo Partial Redundancy Elimination
  * pass. It isn't quite like traditional PRE because we're
@@ -2164,10 +2165,13 @@ function buildPREGraph(state, func) {
                     break;
                 case "Literal":
                     if (refCost(node) > LocalRefCost) {
-                        let decl = literals.get(node.value);
+                        const key = LiteralIntegerRe.test(node.raw)
+                            ? BigInt(node.value)
+                            : node.value;
+                        let decl = literals.get(key);
                         if (!decl) {
                             decl = node;
-                            literals.set(node.value, decl);
+                            literals.set(key, decl);
                         }
                         return {
                             type: "ref",

package/build/optimizer.cjs

@@ -12672,6 +12672,7 @@ var priorityqueuejs = __webpack_require__(2789);
 
 
 
+
 /**
  * This implements a pseudo Partial Redundancy Elimination
  * pass. It isn't quite like traditional PRE because we're
@@ -12856,10 +12857,13 @@ function buildPREGraph(state, func) {
                     break;
                 case "Literal":
                     if (refCost(node) > LocalRefCost) {
-                        let decl = literals.get(node.value);
+                        const key = prettier_plugin_monkeyc_namespaceObject.LiteralIntegerRe.test(node.raw)
+                            ? BigInt(node.value)
+                            : node.value;
+                        let decl = literals.get(key);
                         if (!decl) {
                             decl = node;
-                            literals.set(node.value, decl);
+                            literals.set(key, decl);
                         }
                         return {
                             type: "ref",
@@ -15458,7 +15462,7 @@ async function generateOneConfig(buildConfig, dependencyFiles, config) {
         // the oldest optimized file, we don't need to regenerate
         const source_time = await (0,external_util_cjs_namespaceObject.last_modified)(Object.keys(fnMap).concat(dependencyFiles));
         const opt_time = await (0,external_util_cjs_namespaceObject.first_modified)(Object.values(fnMap).map((v) => v.output));
-        if (source_time < opt_time && 1657670997056 < opt_time) {
+        if (source_time < opt_time && 1657744666168 < opt_time) {
             return { hasTests, diagnostics: prevDiagnostics };
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.31",
+  "version": "1.0.32",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -20,11 +20,11 @@
     "build-debug": "webpack --mode development",
     "build-release": "webpack --mode production",
     "prepack": "webpack --mode production",
-    "test": "npm run test-optimized && npm run test-remote",
+    "test": "npm run test-optimized && npm run test-unopt && npm run test-remote",
     "test-remote": "node ./test/test.js --product=pick-one --github",
-    "test-optimized": "node test/test.js --run-tests --product=fenix5 --product=fr235 --jungle $(pwd)/test/OptimizerTests/monkey.jungle",
-    "test-unopt": "node test/test.js --skipOptimization --run-tests --product=fenix5 --product=fr235 --jungle $(pwd)/test/OptimizerTests/monkey.jungle",
-    "test-garmin-opt": "node test/test.js --skipOptimization --garminOptLevel=2 --run-tests --product=fenix5 --product=fr235 --jungle $(pwd)/test/OptimizerTests/monkey.jungle",
+    "test-optimized": "node test/test.js --typeCheckLevel Strict --run-tests --product=fenix5 --product=fr235 --jungle $(pwd)/test/OptimizerTests/monkey.jungle",
+    "test-unopt": "node test/test.js --typeCheckLevel Strict --skipOptimization --run-tests --product=fenix5 --product=fr235 --jungle $(pwd)/test/OptimizerTests/monkey.jungle",
+    "test-garmin-opt": "node test/test.js --typeCheckLevel Strict --skipOptimization --garminOptLevel=2 --run-tests --product=fenix5 --product=fr235 --jungle $(pwd)/test/OptimizerTests/monkey.jungle",
     "eslint": "npx eslint ."
   },
   "files": [