@markw65/monkeyc-optimizer 1.0.32 → 1.0.33

package/README.md

@@ -384,3 +384,12 @@ Bug Fixes
 - 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
+
+### 1.0.33
+
+- New features
+
+  - Tagging a function with (:keep) will prevent the optimizer from removing it, even if it appears to be unused.
+
+- Bug fixes
+  - Fix PRE to not merge values with different types. ie Number, Long, Float and Double literals should all be treated separately, even when the compare the same.

package/build/api.cjs

@@ -281,6 +281,7 @@ const promises_namespaceObject = require("fs/promises");
 ;// CONCATENATED MODULE: external "prettier"
 const external_prettier_namespaceObject = require("prettier");
 ;// CONCATENATED MODULE: ./src/ast.ts
+
 /*
  * This ensures that mctreeTypeInfo has every key of MCTreeTypeInfo,
  * and that the corresponding arrays contain every element of the
@@ -482,6 +483,44 @@ function ast_withLocDeep(node, start, end, inplace) {
 function ast_cloneDeep(node) {
     return ast_withLocDeep(node, null);
 }
+function ast_getNodeValue(node) {
+    if (node.type == "BinaryExpression" &&
+        node.operator == "as" &&
+        node.right.type == "TypeSpecList" &&
+        node.right.ts.length == 1 &&
+        typeof node.right.ts[0] == "string") {
+        // this is a cast we inserted to retain the type of an enum
+        // any arithmetic on it will revert to "Number", or "Long",
+        // so just ignore it.
+        return ast_getNodeValue(node.left);
+    }
+    if (node.type != "Literal") {
+        return [null, null];
+    }
+    if (node.value === null) {
+        return [node, "Null"];
+    }
+    const type = typeof node.value;
+    if (type === "number") {
+        const match = prettier_plugin_monkeyc_namespaceObject.LiteralIntegerRe.exec(node.raw);
+        if (match) {
+            return match[2] === "l" || match[2] === "L"
+                ? [node, "Long"]
+                : [node, "Number"];
+        }
+        return [node, node.raw.endsWith("d") ? "Double" : "Float"];
+    }
+    if (type === "bigint") {
+        return [node, "Long"];
+    }
+    if (type === "string") {
+        return [node, "String"];
+    }
+    if (type === "boolean") {
+        return [node, "Boolean"];
+    }
+    throw new Error(`Literal has unknown type '${type}'`);
+}
 
 ;// CONCATENATED MODULE: external "./api.cjs"
 const external_api_cjs_namespaceObject = require("./api.cjs");
@@ -1980,7 +2019,6 @@ var priorityqueuejs = __webpack_require__(2789);
 
 
 
-
 /**
  * This implements a pseudo Partial Redundancy Elimination
  * pass. It isn't quite like traditional PRE because we're
@@ -2165,9 +2203,11 @@ function buildPREGraph(state, func) {
                     break;
                 case "Literal":
                     if (refCost(node) > LocalRefCost) {
-                        const key = LiteralIntegerRe.test(node.raw)
-                            ? BigInt(node.value)
-                            : node.value;
+                        const result = getNodeValue(node);
+                        const key = result[1] +
+                            (result[0].value === null
+                                ? ""
+                                : "-" + result[0].value.toString());
                         let decl = literals.get(key);
                         if (!decl) {
                             decl = node;
@@ -3371,7 +3411,7 @@ function getLiteralNode(node) {
             return null;
         switch (node.operator) {
             case "-": {
-                const [arg, type] = getNodeValue(node.argument);
+                const [arg, type] = ast_getNodeValue(node.argument);
                 if (type === "Number" || type === "Long") {
                     return replacementLiteral(arg, -arg.value, type);
                 }
@@ -3380,44 +3420,6 @@ function getLiteralNode(node) {
     }
     return null;
 }
-function getNodeValue(node) {
-    if (node.type == "BinaryExpression" &&
-        node.operator == "as" &&
-        node.right.type == "TypeSpecList" &&
-        node.right.ts.length == 1 &&
-        typeof node.right.ts[0] == "string") {
-        // this is a cast we inserted to retain the type of an enum
-        // any arithmetic on it will revert to "Number", or "Long",
-        // so just ignore it.
-        return getNodeValue(node.left);
-    }
-    if (node.type != "Literal") {
-        return [null, null];
-    }
-    if (node.value === null) {
-        return [node, "Null"];
-    }
-    const type = typeof node.value;
-    if (type === "number") {
-        const match = prettier_plugin_monkeyc_namespaceObject.LiteralIntegerRe.exec(node.raw);
-        if (match) {
-            return match[2] === "l" || match[2] === "L"
-                ? [node, "Long"]
-                : [node, "Number"];
-        }
-        return [node, node.raw.endsWith("d") ? "Double" : "Float"];
-    }
-    if (type === "bigint") {
-        return [node, "Long"];
-    }
-    if (type === "string") {
-        return [node, "String"];
-    }
-    if (type === "boolean") {
-        return [node, "Boolean"];
-    }
-    throw new Error(`Literal has unknown type '${type}'`);
-}
 function fullTypeName(state, tsp) {
     if (typeof tsp.name === "string") {
         return tsp.name;
@@ -4250,6 +4252,11 @@ async function optimizeMonkeyC(fnMap, barrelList, config) {
                 break;
             case "FunctionDeclaration":
                 if (!maybeCalled(node)) {
+                    if (node.attrs &&
+                        node.attrs.attributes &&
+                        node.attrs.attributes.elements.some((attr) => attr.type === "UnaryExpression" && attr.argument.name === "keep")) {
+                        break;
+                    }
                     return false;
                 }
                 break;

package/build/optimizer.cjs

@@ -10977,6 +10977,7 @@ function simulateProgram(prg, device, test = false, logger) {
 }
 
 ;// CONCATENATED MODULE: ./src/ast.ts
+
 /*
  * This ensures that mctreeTypeInfo has every key of MCTreeTypeInfo,
  * and that the corresponding arrays contain every element of the
@@ -11178,6 +11179,44 @@ function withLocDeep(node, start, end, inplace) {
 function cloneDeep(node) {
     return withLocDeep(node, null);
 }
+function getNodeValue(node) {
+    if (node.type == "BinaryExpression" &&
+        node.operator == "as" &&
+        node.right.type == "TypeSpecList" &&
+        node.right.ts.length == 1 &&
+        typeof node.right.ts[0] == "string") {
+        // this is a cast we inserted to retain the type of an enum
+        // any arithmetic on it will revert to "Number", or "Long",
+        // so just ignore it.
+        return getNodeValue(node.left);
+    }
+    if (node.type != "Literal") {
+        return [null, null];
+    }
+    if (node.value === null) {
+        return [node, "Null"];
+    }
+    const type = typeof node.value;
+    if (type === "number") {
+        const match = prettier_plugin_monkeyc_namespaceObject.LiteralIntegerRe.exec(node.raw);
+        if (match) {
+            return match[2] === "l" || match[2] === "L"
+                ? [node, "Long"]
+                : [node, "Number"];
+        }
+        return [node, node.raw.endsWith("d") ? "Double" : "Float"];
+    }
+    if (type === "bigint") {
+        return [node, "Long"];
+    }
+    if (type === "string") {
+        return [node, "String"];
+    }
+    if (type === "boolean") {
+        return [node, "Boolean"];
+    }
+    throw new Error(`Literal has unknown type '${type}'`);
+}
 
 ;// CONCATENATED MODULE: ./src/function-info.ts
 
@@ -12672,7 +12711,6 @@ var priorityqueuejs = __webpack_require__(2789);
 
 
 
-
 /**
  * This implements a pseudo Partial Redundancy Elimination
  * pass. It isn't quite like traditional PRE because we're
@@ -12857,9 +12895,11 @@ function buildPREGraph(state, func) {
                     break;
                 case "Literal":
                     if (refCost(node) > LocalRefCost) {
-                        const key = prettier_plugin_monkeyc_namespaceObject.LiteralIntegerRe.test(node.raw)
-                            ? BigInt(node.value)
-                            : node.value;
+                        const result = getNodeValue(node);
+                        const key = result[1] +
+                            (result[0].value === null
+                                ? ""
+                                : "-" + result[0].value.toString());
                         let decl = literals.get(key);
                         if (!decl) {
                             decl = node;
@@ -14071,44 +14111,6 @@ function getLiteralNode(node) {
     }
     return null;
 }
-function getNodeValue(node) {
-    if (node.type == "BinaryExpression" &&
-        node.operator == "as" &&
-        node.right.type == "TypeSpecList" &&
-        node.right.ts.length == 1 &&
-        typeof node.right.ts[0] == "string") {
-        // this is a cast we inserted to retain the type of an enum
-        // any arithmetic on it will revert to "Number", or "Long",
-        // so just ignore it.
-        return getNodeValue(node.left);
-    }
-    if (node.type != "Literal") {
-        return [null, null];
-    }
-    if (node.value === null) {
-        return [node, "Null"];
-    }
-    const type = typeof node.value;
-    if (type === "number") {
-        const match = prettier_plugin_monkeyc_namespaceObject.LiteralIntegerRe.exec(node.raw);
-        if (match) {
-            return match[2] === "l" || match[2] === "L"
-                ? [node, "Long"]
-                : [node, "Number"];
-        }
-        return [node, node.raw.endsWith("d") ? "Double" : "Float"];
-    }
-    if (type === "bigint") {
-        return [node, "Long"];
-    }
-    if (type === "string") {
-        return [node, "String"];
-    }
-    if (type === "boolean") {
-        return [node, "Boolean"];
-    }
-    throw new Error(`Literal has unknown type '${type}'`);
-}
 function fullTypeName(state, tsp) {
     if (typeof tsp.name === "string") {
         return tsp.name;
@@ -14941,6 +14943,11 @@ async function optimizeMonkeyC(fnMap, barrelList, config) {
                 break;
             case "FunctionDeclaration":
                 if (!maybeCalled(node)) {
+                    if (node.attrs &&
+                        node.attrs.attributes &&
+                        node.attrs.attributes.elements.some((attr) => attr.type === "UnaryExpression" && attr.argument.name === "keep")) {
+                        break;
+                    }
                     return false;
                 }
                 break;
@@ -15462,7 +15469,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 && 1657744666168 < opt_time) {
+        if (source_time < opt_time && 1658088370253 < opt_time) {
             return { hasTests, diagnostics: prevDiagnostics };
         }
     }

package/build/src/ast.d.ts

@@ -8,3 +8,22 @@ export declare function hasProperty<T>(obj: T, prop: string): boolean;
 export declare function withLoc<T extends mctree.Node>(node: T, start: mctree.Node | null, end?: mctree.Node | undefined): T;
 export declare function withLocDeep<T extends mctree.Node>(node: T, start: mctree.Node | null, end?: mctree.Node | undefined, inplace?: boolean): T;
 export declare function cloneDeep<T extends mctree.Node>(node: T): T;
+interface NumberLiteral extends mctree.Literal {
+    value: number;
+}
+interface LongLiteral extends mctree.Literal {
+    value: number | bigint;
+}
+interface StringLiteral extends mctree.Literal {
+    value: string;
+}
+interface BooleanLiteral extends mctree.Literal {
+    value: boolean;
+}
+interface NullLiteral extends mctree.Literal {
+    value: null;
+}
+declare type LiteralValues = [NumberLiteral, "Number" | "Float" | "Double"] | [LongLiteral, "Long"] | [StringLiteral, "String"] | [BooleanLiteral, "Boolean"] | [NullLiteral, "Null"];
+export declare function getNodeValue(node: mctree.Literal): LiteralValues;
+export declare function getNodeValue(node: mctree.Node): LiteralValues | [null, null];
+export {};

package/package.json

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