@markw65/monkeyc-optimizer 1.0.23 → 1.0.26

package/README.md

@@ -275,3 +275,20 @@ More fixes found via open source projects.
 - Tests
   - Various new tests for module/class/local resolution of symbols
   - Make tests fail by default if the optimizer reports any undefined symbols, and add `@expects` or `checkInvalidSymbols=WARNING` as needed to prevent test failures.
+
+### 1.0.24
+
+- Bug fix
+  - The new ast.ts didn't pick up child elements that could be either a string or a node. This resulted in it missing the name in TypeSpecPart.
+
+### 1.0.25
+
+- Bug fix
+  - estree-types was missing the returnType on FunctionDeclaration. Update to latest prettier-plugin, and fix ast.ts.
+
+### 1.0.26
+
+- Bug fixes
+  - Use `self.` rather than `ClassName.` to qualify names that would otherwise collide with locals, since that works with both public and private variables
+  - Fix a bug that caused the inliner to fail to qualify certain names, even if there was a collision with an existing local variables
+  - Fix some name lookup issues relating to whether the lookup is done as a type or a value.

package/build/api.cjs

@@ -108,7 +108,7 @@ const mctreeTypeInfo = {
     EnumStringMember: ["id", "init"],
     ExpressionStatement: ["expression"],
     ForStatement: ["init", "test", "body", "update"],
-    FunctionDeclaration: ["attrs", "id", "params", "body"],
+    FunctionDeclaration: ["attrs", "id", "params", "returnType", "body"],
     Identifier: [],
     IfStatement: ["test", "consequent", "alternate"],
     ImportModule: ["id"],
@@ -135,7 +135,7 @@ const mctreeTypeInfo = {
     TryStatement: ["block", "handler", "finalizer"],
     TypedefDeclaration: ["attrs", "id", "ts"],
     TypeSpecList: ["ts"],
-    TypeSpecPart: ["body", "callspec", "generics"],
+    TypeSpecPart: ["name", "body", "callspec", "generics"],
     UnaryExpression: ["argument"],
     UpdateExpression: ["argument"],
     Using: ["id", "as"],
@@ -441,11 +441,28 @@ function inliner_shouldInline(state, func, call, context) {
     }
     return false;
 }
-function processInlineBody(state, func, call, root, insertedVariableDecls, params) {
+// We still need to keep track of every local name that was
+// already in use before we started inlining, but we don't want to
+// use any of its renames. We also want to know whether a local is
+// from the function being inlined, or the calling function, so
+// set every element to false.
+function fixupLocalsMap(state) {
+    if (!state.localsStack)
+        throw new Error("No local variable map!");
+    const locals = state.localsStack[state.localsStack.length - 1];
+    const { map } = locals;
+    if (!map)
+        throw new Error("No local variable map!");
+    const original = { ...map };
+    Object.keys(map).forEach((key) => (map[key] = false));
+    return original;
+}
+function processInlineBody(state, func, call, root, params) {
     let failed = false;
     const pre = state.pre;
     const post = state.post;
     state.inlining = true;
+    let insertedVariableDecls = null;
     try {
         state.pre = (node) => {
             if (failed)
@@ -457,15 +474,10 @@ function processInlineBody(state, func, call, root, insertedVariableDecls, param
                 return false;
             const result = pre(node, state);
             if (!insertedVariableDecls && node.type === "BlockStatement") {
+                // the block just created a new locals map, so we don't
+                // need to restore it at the end.
+                fixupLocalsMap(state);
                 const locals = state.localsStack[state.localsStack.length - 1];
-                const { map } = locals;
-                if (!map)
-                    throw new Error("No local variable map!");
-                // We still need to keep track of every local name that was
-                // already in use, but we don't want to use any of its renames.
-                // We also want to know whether a local is from the function being
-                // inlined, or the calling function, so set every element to false.
-                Object.keys(map).forEach((key) => (map[key] = false));
                 const declarations = func.node.params
                     .map((param, i) => {
                     const paramName = variableDeclarationName(param);
@@ -542,6 +554,8 @@ function inliner_unused(expression, top) {
             return [];
         case "Identifier":
             return [];
+        case "ThisExpression":
+            return [];
         case "BinaryExpression":
             if (expression.operator === "as") {
                 return inliner_unused(expression.left);
@@ -644,7 +658,7 @@ function inlineWithArgs(state, func, call, context) {
         const name = variableDeclarationName(param);
         return [name, argnum];
     }));
-    if (!processInlineBody(state, func, call, body, func.node.params.length ? false : true, params)) {
+    if (!processInlineBody(state, func, call, body, params)) {
         return null;
     }
     inliner_diagnostic(state, call.loc, null);
@@ -676,7 +690,10 @@ function inliner_inlineFunction(state, func, call, context) {
     }
     const retArg = JSON.parse(JSON.stringify(func.node.body.body[0].argument));
     const params = Object.fromEntries(func.node.params.map((param, i) => [variableDeclarationName(param), i]));
-    return processInlineBody(state, func, call, retArg, true, params);
+    const map = fixupLocalsMap(state);
+    const ret = processInlineBody(state, func, call, retArg, params);
+    state.localsStack[state.localsStack.length - 1].map = map;
+    return ret;
 }
 function applyTypeIfNeeded(node) {
     if ("enumType" in node && node.enumType) {
@@ -729,6 +746,15 @@ function fixNodeScope(state, lookupNode, nodeStack) {
         return "";
     }))
         .flat();
+    const member = (object, property) => ({
+        type: "MemberExpression",
+        object,
+        property,
+        computed: false,
+        start: node.start,
+        end: node.end,
+        loc: node.loc,
+    });
     if (prefixes.length &&
         prefixes[0].startsWith("$.") &&
         prefixes.every((prefix, i) => !i || prefix === prefixes[i - 1])) {
@@ -742,38 +768,32 @@ function fixNodeScope(state, lookupNode, nodeStack) {
                 found = true;
                 return current;
             }
-            const object = typeof name === "string"
-                ? {
-                    type: "Identifier",
-                    name,
-                    start: node.start,
-                    end: node.end,
-                    loc: node.loc,
-                }
-                : name;
-            let root = null;
-            let property = current;
-            while (property.type !== "Identifier") {
-                root = property;
-                property = property.object;
-            }
-            const mb = {
-                type: "MemberExpression",
-                object,
-                property,
-                computed: false,
+            const object = {
+                type: "Identifier",
+                name,
                 start: node.start,
                 end: node.end,
                 loc: node.loc,
             };
-            if (root) {
-                root.object = mb;
-            }
-            else {
-                current = mb;
+            let root = null;
+            let property = current;
+            do {
+                root = property;
+                property = property.object;
+            } while (property.type === "MemberExpression");
+            if (property.type === "ThisExpression") {
+                root.object = object;
+                return root;
             }
+            root.object = member(object, property);
             return current;
-        }, node);
+        }, member({
+            type: "ThisExpression",
+            text: "self",
+            start: node.start,
+            end: node.end,
+            loc: node.loc,
+        }, node));
     }
     return null;
 }
@@ -2213,6 +2233,7 @@ function api_collectNamespaces(ast, stateIn) {
                     state.stack[0].node = node;
                     break;
                 case "TypeSpecList":
+                case "TypeSpecPart":
                     state.inType = true;
                     break;
                 case "ImportModule":
@@ -2454,6 +2475,11 @@ function api_collectNamespaces(ast, stateIn) {
                 if (state.post)
                     ret = state.post(node, state);
                 switch (type) {
+                    // Don't clear inType for TypeSpecPart, since they
+                    // generally occur in TypeSpecLists. But do clear it for
+                    // SizedArrayExpression, since thats the only place they
+                    // happen on their own.
+                    case "SizedArrayExpression":
                     case "TypeSpecList":
                     case "TypedefDeclaration":
                     case "EnumDeclaration":

package/build/optimizer.cjs

@@ -10834,7 +10834,7 @@ const mctreeTypeInfo = {
     EnumStringMember: ["id", "init"],
     ExpressionStatement: ["expression"],
     ForStatement: ["init", "test", "body", "update"],
-    FunctionDeclaration: ["attrs", "id", "params", "body"],
+    FunctionDeclaration: ["attrs", "id", "params", "returnType", "body"],
     Identifier: [],
     IfStatement: ["test", "consequent", "alternate"],
     ImportModule: ["id"],
@@ -10861,7 +10861,7 @@ const mctreeTypeInfo = {
     TryStatement: ["block", "handler", "finalizer"],
     TypedefDeclaration: ["attrs", "id", "ts"],
     TypeSpecList: ["ts"],
-    TypeSpecPart: ["body", "callspec", "generics"],
+    TypeSpecPart: ["name", "body", "callspec", "generics"],
     UnaryExpression: ["argument"],
     UpdateExpression: ["argument"],
     Using: ["id", "as"],
@@ -11165,11 +11165,28 @@ function shouldInline(state, func, call, context) {
     }
     return false;
 }
-function processInlineBody(state, func, call, root, insertedVariableDecls, params) {
+// We still need to keep track of every local name that was
+// already in use before we started inlining, but we don't want to
+// use any of its renames. We also want to know whether a local is
+// from the function being inlined, or the calling function, so
+// set every element to false.
+function fixupLocalsMap(state) {
+    if (!state.localsStack)
+        throw new Error("No local variable map!");
+    const locals = state.localsStack[state.localsStack.length - 1];
+    const { map } = locals;
+    if (!map)
+        throw new Error("No local variable map!");
+    const original = { ...map };
+    Object.keys(map).forEach((key) => (map[key] = false));
+    return original;
+}
+function processInlineBody(state, func, call, root, params) {
     let failed = false;
     const pre = state.pre;
     const post = state.post;
     state.inlining = true;
+    let insertedVariableDecls = null;
     try {
         state.pre = (node) => {
             if (failed)
@@ -11181,15 +11198,10 @@ function processInlineBody(state, func, call, root, insertedVariableDecls, param
                 return false;
             const result = pre(node, state);
             if (!insertedVariableDecls && node.type === "BlockStatement") {
+                // the block just created a new locals map, so we don't
+                // need to restore it at the end.
+                fixupLocalsMap(state);
                 const locals = state.localsStack[state.localsStack.length - 1];
-                const { map } = locals;
-                if (!map)
-                    throw new Error("No local variable map!");
-                // We still need to keep track of every local name that was
-                // already in use, but we don't want to use any of its renames.
-                // We also want to know whether a local is from the function being
-                // inlined, or the calling function, so set every element to false.
-                Object.keys(map).forEach((key) => (map[key] = false));
                 const declarations = func.node.params
                     .map((param, i) => {
                     const paramName = (0,external_api_cjs_namespaceObject.variableDeclarationName)(param);
@@ -11266,6 +11278,8 @@ function unused(expression, top) {
             return [];
         case "Identifier":
             return [];
+        case "ThisExpression":
+            return [];
         case "BinaryExpression":
             if (expression.operator === "as") {
                 return unused(expression.left);
@@ -11368,7 +11382,7 @@ function inlineWithArgs(state, func, call, context) {
         const name = (0,external_api_cjs_namespaceObject.variableDeclarationName)(param);
         return [name, argnum];
     }));
-    if (!processInlineBody(state, func, call, body, func.node.params.length ? false : true, params)) {
+    if (!processInlineBody(state, func, call, body, params)) {
         return null;
     }
     diagnostic(state, call.loc, null);
@@ -11400,7 +11414,10 @@ function inlineFunction(state, func, call, context) {
     }
     const retArg = JSON.parse(JSON.stringify(func.node.body.body[0].argument));
     const params = Object.fromEntries(func.node.params.map((param, i) => [(0,external_api_cjs_namespaceObject.variableDeclarationName)(param), i]));
-    return processInlineBody(state, func, call, retArg, true, params);
+    const map = fixupLocalsMap(state);
+    const ret = processInlineBody(state, func, call, retArg, params);
+    state.localsStack[state.localsStack.length - 1].map = map;
+    return ret;
 }
 function applyTypeIfNeeded(node) {
     if ("enumType" in node && node.enumType) {
@@ -11453,6 +11470,15 @@ function fixNodeScope(state, lookupNode, nodeStack) {
         return "";
     }))
         .flat();
+    const member = (object, property) => ({
+        type: "MemberExpression",
+        object,
+        property,
+        computed: false,
+        start: node.start,
+        end: node.end,
+        loc: node.loc,
+    });
     if (prefixes.length &&
         prefixes[0].startsWith("$.") &&
         prefixes.every((prefix, i) => !i || prefix === prefixes[i - 1])) {
@@ -11466,38 +11492,32 @@ function fixNodeScope(state, lookupNode, nodeStack) {
                 found = true;
                 return current;
             }
-            const object = typeof name === "string"
-                ? {
-                    type: "Identifier",
-                    name,
-                    start: node.start,
-                    end: node.end,
-                    loc: node.loc,
-                }
-                : name;
-            let root = null;
-            let property = current;
-            while (property.type !== "Identifier") {
-                root = property;
-                property = property.object;
-            }
-            const mb = {
-                type: "MemberExpression",
-                object,
-                property,
-                computed: false,
+            const object = {
+                type: "Identifier",
+                name,
                 start: node.start,
                 end: node.end,
                 loc: node.loc,
             };
-            if (root) {
-                root.object = mb;
-            }
-            else {
-                current = mb;
+            let root = null;
+            let property = current;
+            do {
+                root = property;
+                property = property.object;
+            } while (property.type === "MemberExpression");
+            if (property.type === "ThisExpression") {
+                root.object = object;
+                return root;
             }
+            root.object = member(object, property);
             return current;
-        }, node);
+        }, member({
+            type: "ThisExpression",
+            text: "self",
+            start: node.start,
+            end: node.end,
+            loc: node.loc,
+        }, node));
     }
     return null;
 }
@@ -13085,7 +13105,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 && 1655677006664 < opt_time) {
+        if (source_time < opt_time && 1655771632397 < opt_time) {
             return { hasTests, diagnostics: prevDiagnostics };
         }
     }

package/build/src/pre.d.ts

@@ -0,0 +1 @@
+export declare function sizeBasedPRE(state: ProgramStateAnalysis, func: FunctionStateNode): void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.23",
+  "version": "1.0.26",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -37,7 +37,7 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.27"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.28"
   },
   "devDependencies": {
     "@types/glob": "^7.2.0",