@markw65/monkeyc-optimizer 1.1.5 → 1.1.6

package/README.md

@@ -642,3 +642,10 @@ Bug Fixes
 - Bug fixes
   - Always evaluate a constant's initializer to determine its type
   - Fix a bug refining the object type based on the properties it accesses that could lose the type of the object.
+
+### 1.1.6
+
+- Bug fixes
+  - Fix an issue in restrictByEquality when restricting a union including an Enum, to a specific value of the enum.
+  - Fix the display of Method types to match the syntax used in MonkeyC.
+  - Infer the type of method(:symbol) by looking up symbol.

package/build/api.cjs

@@ -3380,7 +3380,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, logThisRun) {
             const info = sysCallInfo(callee);
             if (!info)
                 return false;
-            const result = info(callee, calleeObj, () => node.arguments.map((arg) => evaluateExpr(state, arg, typeMap).value));
+            const result = info(istate.state, callee, calleeObj, () => node.arguments.map((arg) => evaluateExpr(state, arg, typeMap).value));
             if (result.calleeObj) {
                 setStateEvent(curState, calleeObjDecl, result.calleeObj, false);
             }
@@ -4702,14 +4702,18 @@ function evaluateLogicalTypes(op, left, right) {
 
 "use strict";
 /* unused harmony exports evaluateCall, checkCallArgs, sysCallInfo */
-/* harmony import */ var _api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(6817);
-/* harmony import */ var _api__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_api__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6906);
-/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_util__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _interp__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(7161);
-/* harmony import */ var _sub_type__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9234);
-/* harmony import */ var _types__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7255);
-/* harmony import */ var _union_type__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(757);
+/* harmony import */ var _optimizer_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9697);
+/* harmony import */ var _type_flow__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4859);
+/* harmony import */ var _api__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(6817);
+/* harmony import */ var _api__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_api__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6906);
+/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_util__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _interp__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7161);
+/* harmony import */ var _sub_type__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(9234);
+/* harmony import */ var _types__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(7255);
+/* harmony import */ var _union_type__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(757);
+
+
 
 
 
@@ -4738,6 +4742,20 @@ function evaluateCall(istate, node, callee, args) {
     }
     return checkCallArgs(istate, node, callee.value, args);
 }
+function calleeObjectType(istate, callee) {
+    if (callee.type === "MemberExpression") {
+        return (istate.typeMap?.get(callee.object) || {
+            type: 524287 /* TypeTag.Any */,
+        });
+    }
+    if (callee.type === "Identifier" && istate.func) {
+        const func = istate.func;
+        const [self] = func.stack.slice(-1);
+        return typeFromTypeStateNode(istate.state, self, (func.attributes & StateNodeAttributes.STATIC) !== 0 ||
+            self.type !== "ClassDeclaration");
+    }
+    return null;
+}
 function checkCallArgs(istate, node, callees, args) {
     const allDiags = [];
     const resultType = reduce(callees, (result, cur) => {
@@ -4747,13 +4765,11 @@ function checkCallArgs(istate, node, callees, args) {
         let returnType = null;
         let effects = true;
         let argEffects = true;
-        if (node.callee.type === "MemberExpression") {
-            const object = istate.typeMap?.get(node.callee.object) || {
-                type: 524287 /* TypeTag.Any */,
-            };
+        const object = calleeObjectType(istate, node.callee);
+        if (object) {
             const info = sysCallInfo(cur);
             if (info) {
-                const result = info(cur, object, () => args);
+                const result = info(istate.state, cur, object, () => args);
                 if (result.argTypes)
                     argTypes = result.argTypes;
                 if (result.returnType)
@@ -4892,7 +4908,7 @@ function sysCallInfo(func) {
 function getSystemCallTable() {
     if (systemCallInfo)
         return systemCallInfo;
-    const arrayAdd = (callee, calleeObj, getArgs) => {
+    const arrayAdd = (state, callee, calleeObj, getArgs) => {
         const ret = {};
         if (calleeObj.type & 512 /* TypeTag.Array */) {
             const adata = getUnionComponent(calleeObj, 512 /* TypeTag.Array */);
@@ -4924,7 +4940,7 @@ function getSystemCallTable() {
         }
         return ret;
     };
-    const arrayRet = (callee, calleeObj, _getArgs) => {
+    const arrayRet = (state, callee, calleeObj, _getArgs) => {
         const ret = { effectFree: true };
         if (calleeObj.type & 512 /* TypeTag.Array */) {
             const adata = getUnionComponent(calleeObj, 512 /* TypeTag.Array */);
@@ -4934,7 +4950,7 @@ function getSystemCallTable() {
         }
         return ret;
     };
-    const dictionaryGet = (callee, calleeObj, getArgs) => {
+    const dictionaryGet = (state, callee, calleeObj, getArgs) => {
         const ret = { effectFree: true };
         if (calleeObj.type & 1024 /* TypeTag.Dictionary */) {
             const ddata = getUnionComponent(calleeObj, 1024 /* TypeTag.Dictionary */);
@@ -4948,7 +4964,7 @@ function getSystemCallTable() {
         }
         return ret;
     };
-    const dictionaryValues = (callee, calleeObj) => {
+    const dictionaryValues = (state, callee, calleeObj) => {
         const ret = { effectFree: true };
         if (calleeObj.type & 1024 /* TypeTag.Dictionary */) {
             const ddata = getUnionComponent(calleeObj, 1024 /* TypeTag.Dictionary */);
@@ -4958,7 +4974,7 @@ function getSystemCallTable() {
         }
         return ret;
     };
-    const dictionaryKeys = (callee, calleeObj) => {
+    const dictionaryKeys = (state, callee, calleeObj) => {
         const ret = { effectFree: true };
         if (calleeObj.type & 1024 /* TypeTag.Dictionary */) {
             const ddata = getUnionComponent(calleeObj, 1024 /* TypeTag.Dictionary */);
@@ -4968,7 +4984,7 @@ function getSystemCallTable() {
         }
         return ret;
     };
-    const dictionaryPut = (callee, calleeObj, getArgs) => {
+    const dictionaryPut = (state, callee, calleeObj, getArgs) => {
         const ret = {};
         if (calleeObj.type & 1024 /* TypeTag.Dictionary */) {
             const ddata = getUnionComponent(calleeObj, 1024 /* TypeTag.Dictionary */);
@@ -4999,7 +5015,7 @@ function getSystemCallTable() {
         }
         return ret;
     };
-    const methodInvoke = (callee, calleeObj, getArgs) => {
+    const methodInvoke = (state, callee, calleeObj, getArgs) => {
         const ret = { argEffects: true };
         if (calleeObj.type & 2048 /* TypeTag.Method */) {
             const data = getUnionComponent(calleeObj, 2048 /* TypeTag.Method */);
@@ -5012,9 +5028,49 @@ function getSystemCallTable() {
         ret.argTypes = getArgs();
         return ret;
     };
+    const method = (state, callee, calleeObj, getArgs) => {
+        const ret = {};
+        const args = getArgs();
+        if (args.length === 1 &&
+            hasValue(args[0]) &&
+            args[0].type === 131072 /* TypeTag.Symbol */) {
+            const symbol = {
+                type: "Identifier",
+                name: args[0].value,
+            };
+            const next = {
+                type: "MemberExpression",
+                object: symbol,
+                property: symbol,
+                computed: false,
+            };
+            const [, trueDecls] = findObjectDeclsByProperty(state, calleeObj, next);
+            if (!trueDecls)
+                return ret;
+            const callees = trueDecls
+                .flatMap((decl) => decl.decls?.[symbol.name])
+                .filter((decl) => decl?.type === "FunctionDeclaration");
+            if (!callees.length)
+                return ret;
+            ret.returnType = callees.reduce((type, callee) => {
+                const result = callee.node.returnType
+                    ? typeFromTypespec(state, callee.node.returnType.argument, callee.stack)
+                    : { type: 524287 /* TypeTag.Any */ };
+                const args = callee.node.params.map((param) => param.type === "BinaryExpression"
+                    ? typeFromTypespec(state, param.right, callee.stack)
+                    : { type: 524287 /* TypeTag.Any */ });
+                unionInto(type, {
+                    type: 2048 /* TypeTag.Method */,
+                    value: { result, args },
+                });
+                return type;
+            }, { type: 0 /* TypeTag.Never */ });
+        }
+        return ret;
+    };
     const nop = () => ({ effectFree: true });
     const mod = () => ({});
-    const rounder = (callee, calleeObj, getArgs) => {
+    const rounder = (state, callee, calleeObj, getArgs) => {
         const results = {};
         const fn = Math[callee.name];
         results.effectFree = true;
@@ -5032,7 +5088,7 @@ function getSystemCallTable() {
             : { type: 120 /* TypeTag.Numeric */ };
         return results;
     };
-    const mathHelper = (callee, calleeObj, getArgs, helper) => {
+    const mathHelper = (state, callee, calleeObj, getArgs, helper) => {
         const results = {};
         const fn = helper && typeof helper === "function"
             ? helper
@@ -5091,6 +5147,7 @@ function getSystemCallTable() {
         "$.Toybox.Lang.Dictionary.toString": nop,
         "$.Toybox.Lang.Dictionary.values": dictionaryValues,
         "$.Toybox.Lang.Method.invoke": methodInvoke,
+        "$.Toybox.Lang.Object.method": method,
         "$.Toybox.Math.acos": mathHelper,
         "$.Toybox.Math.asin": mathHelper,
         "$.Toybox.Math.atan": mathHelper,
@@ -5098,15 +5155,15 @@ function getSystemCallTable() {
         "$.Toybox.Math.ceil": rounder,
         "$.Toybox.Math.cos": mathHelper,
         "$.Toybox.Math.floor": rounder,
-        "$.Toybox.Math.ln": (callee, calleeObj, getArgs) => mathHelper(callee, calleeObj, getArgs, "log"),
-        "$.Toybox.Math.log": (callee, calleeObj, getArgs) => mathHelper(callee, calleeObj, getArgs, (x, base) => Math.log(x) / Math.log(base)),
+        "$.Toybox.Math.ln": (state, callee, calleeObj, getArgs) => mathHelper(state, callee, calleeObj, getArgs, "log"),
+        "$.Toybox.Math.log": (state, callee, calleeObj, getArgs) => mathHelper(state, callee, calleeObj, getArgs, (x, base) => Math.log(x) / Math.log(base)),
         "$.Toybox.Math.pow": mathHelper,
         "$.Toybox.Math.round": rounder,
         "$.Toybox.Math.sin": mathHelper,
         "$.Toybox.Math.sqrt": mathHelper,
         "$.Toybox.Math.tan": mathHelper,
-        "$.Toybox.Math.toDegrees": (callee, calleeObj, getArgs) => mathHelper(callee, calleeObj, getArgs, (arg) => (arg * 180) / Math.PI),
-        "$.Toybox.Math.toRadians": (callee, calleeObj, getArgs) => mathHelper(callee, calleeObj, getArgs, (arg) => (arg * Math.PI) / 180),
+        "$.Toybox.Math.toDegrees": (state, callee, calleeObj, getArgs) => mathHelper(state, callee, calleeObj, getArgs, (arg) => (arg * 180) / Math.PI),
+        "$.Toybox.Math.toRadians": (state, callee, calleeObj, getArgs) => mathHelper(state, callee, calleeObj, getArgs, (arg) => (arg * Math.PI) / 180),
         "$.Toybox.Math.mean": nop,
         "$.Toybox.Math.mode": nop,
         "$.Toybox.Math.stdev": nop,
@@ -7312,8 +7369,8 @@ function display(type) {
             case 1024 /* TypeTag.Dictionary */:
                 return `${display(tv.value.key)}, ${display(tv.value.value)}`;
             case 2048 /* TypeTag.Method */:
-                return `(${tv.value.args
-                    .map((arg) => display(arg))
+                return `Method(${tv.value.args
+                    .map((arg, i) => `a${i + 1} as ${display(arg)}`)
                     .join(", ")}) as ${display(tv.value.result)}`;
             case 4096 /* TypeTag.Module */:
             case 8192 /* TypeTag.Function */:
@@ -7373,6 +7430,7 @@ function display(type) {
                 65536 /* TypeTag.Enum */ |
                 262144 /* TypeTag.Typedef */ |
                 131072 /* TypeTag.Symbol */ |
+                2048 /* TypeTag.Method */ |
                 256 /* TypeTag.String */)) {
             parts.push(valueStr);
         }
@@ -7400,7 +7458,7 @@ function forEachUnionComponent(v, bits, fn) {
     bits &= ~SingleTonTypeTagsConst;
     if (!bits)
         return;
-    if (v.type & UnionDataTypeTagsConst) {
+    if ((v.type | bits) & UnionDataTypeTagsConst) {
         // Don't iterate the value type bits if any union bit is set
         bits &= ~ValueTypeTagsConst;
     }

package/build/optimizer.cjs

@@ -9848,8 +9848,8 @@ function display(type) {
             case 1024 /* TypeTag.Dictionary */:
                 return `${display(tv.value.key)}, ${display(tv.value.value)}`;
             case 2048 /* TypeTag.Method */:
-                return `(${tv.value.args
-                    .map((arg) => display(arg))
+                return `Method(${tv.value.args
+                    .map((arg, i) => `a${i + 1} as ${display(arg)}`)
                     .join(", ")}) as ${display(tv.value.result)}`;
             case 4096 /* TypeTag.Module */:
             case 8192 /* TypeTag.Function */:
@@ -9909,6 +9909,7 @@ function display(type) {
                 65536 /* TypeTag.Enum */ |
                 262144 /* TypeTag.Typedef */ |
                 131072 /* TypeTag.Symbol */ |
+                2048 /* TypeTag.Method */ |
                 256 /* TypeTag.String */)) {
             parts.push(valueStr);
         }
@@ -9936,7 +9937,7 @@ function forEachUnionComponent(v, bits, fn) {
     bits &= ~SingleTonTypeTagsConst;
     if (!bits)
         return;
-    if (v.type & UnionDataTypeTagsConst) {
+    if ((v.type | bits) & UnionDataTypeTagsConst) {
         // Don't iterate the value type bits if any union bit is set
         bits &= ~ValueTypeTagsConst;
     }
@@ -10604,6 +10605,8 @@ function evaluateLogicalTypes(op, left, right) {
 
 
 
+
+
 function evaluateCall(istate, node, callee, args) {
     while (!hasValue(callee) || callee.type !== 8192 /* TypeTag.Function */) {
         const name = node.callee.type === "Identifier"
@@ -10626,6 +10629,20 @@ function evaluateCall(istate, node, callee, args) {
     }
     return checkCallArgs(istate, node, callee.value, args);
 }
+function calleeObjectType(istate, callee) {
+    if (callee.type === "MemberExpression") {
+        return (istate.typeMap?.get(callee.object) || {
+            type: 524287 /* TypeTag.Any */,
+        });
+    }
+    if (callee.type === "Identifier" && istate.func) {
+        const func = istate.func;
+        const [self] = func.stack.slice(-1);
+        return typeFromTypeStateNode(istate.state, self, (func.attributes & StateNodeAttributes.STATIC) !== 0 ||
+            self.type !== "ClassDeclaration");
+    }
+    return null;
+}
 function checkCallArgs(istate, node, callees, args) {
     const allDiags = [];
     const resultType = (0,external_util_cjs_namespaceObject.reduce)(callees, (result, cur) => {
@@ -10635,13 +10652,11 @@ function checkCallArgs(istate, node, callees, args) {
         let returnType = null;
         let effects = true;
         let argEffects = true;
-        if (node.callee.type === "MemberExpression") {
-            const object = istate.typeMap?.get(node.callee.object) || {
-                type: 524287 /* TypeTag.Any */,
-            };
+        const object = calleeObjectType(istate, node.callee);
+        if (object) {
             const info = sysCallInfo(cur);
             if (info) {
-                const result = info(cur, object, () => args);
+                const result = info(istate.state, cur, object, () => args);
                 if (result.argTypes)
                     argTypes = result.argTypes;
                 if (result.returnType)
@@ -10780,7 +10795,7 @@ function sysCallInfo(func) {
 function getSystemCallTable() {
     if (systemCallInfo)
         return systemCallInfo;
-    const arrayAdd = (callee, calleeObj, getArgs) => {
+    const arrayAdd = (state, callee, calleeObj, getArgs) => {
         const ret = {};
         if (calleeObj.type & 512 /* TypeTag.Array */) {
             const adata = getUnionComponent(calleeObj, 512 /* TypeTag.Array */);
@@ -10812,7 +10827,7 @@ function getSystemCallTable() {
         }
         return ret;
     };
-    const arrayRet = (callee, calleeObj, _getArgs) => {
+    const arrayRet = (state, callee, calleeObj, _getArgs) => {
         const ret = { effectFree: true };
         if (calleeObj.type & 512 /* TypeTag.Array */) {
             const adata = getUnionComponent(calleeObj, 512 /* TypeTag.Array */);
@@ -10822,7 +10837,7 @@ function getSystemCallTable() {
         }
         return ret;
     };
-    const dictionaryGet = (callee, calleeObj, getArgs) => {
+    const dictionaryGet = (state, callee, calleeObj, getArgs) => {
         const ret = { effectFree: true };
         if (calleeObj.type & 1024 /* TypeTag.Dictionary */) {
             const ddata = getUnionComponent(calleeObj, 1024 /* TypeTag.Dictionary */);
@@ -10836,7 +10851,7 @@ function getSystemCallTable() {
         }
         return ret;
     };
-    const dictionaryValues = (callee, calleeObj) => {
+    const dictionaryValues = (state, callee, calleeObj) => {
         const ret = { effectFree: true };
         if (calleeObj.type & 1024 /* TypeTag.Dictionary */) {
             const ddata = getUnionComponent(calleeObj, 1024 /* TypeTag.Dictionary */);
@@ -10846,7 +10861,7 @@ function getSystemCallTable() {
         }
         return ret;
     };
-    const dictionaryKeys = (callee, calleeObj) => {
+    const dictionaryKeys = (state, callee, calleeObj) => {
         const ret = { effectFree: true };
         if (calleeObj.type & 1024 /* TypeTag.Dictionary */) {
             const ddata = getUnionComponent(calleeObj, 1024 /* TypeTag.Dictionary */);
@@ -10856,7 +10871,7 @@ function getSystemCallTable() {
         }
         return ret;
     };
-    const dictionaryPut = (callee, calleeObj, getArgs) => {
+    const dictionaryPut = (state, callee, calleeObj, getArgs) => {
         const ret = {};
         if (calleeObj.type & 1024 /* TypeTag.Dictionary */) {
             const ddata = getUnionComponent(calleeObj, 1024 /* TypeTag.Dictionary */);
@@ -10887,7 +10902,7 @@ function getSystemCallTable() {
         }
         return ret;
     };
-    const methodInvoke = (callee, calleeObj, getArgs) => {
+    const methodInvoke = (state, callee, calleeObj, getArgs) => {
         const ret = { argEffects: true };
         if (calleeObj.type & 2048 /* TypeTag.Method */) {
             const data = getUnionComponent(calleeObj, 2048 /* TypeTag.Method */);
@@ -10900,9 +10915,49 @@ function getSystemCallTable() {
         ret.argTypes = getArgs();
         return ret;
     };
+    const method = (state, callee, calleeObj, getArgs) => {
+        const ret = {};
+        const args = getArgs();
+        if (args.length === 1 &&
+            hasValue(args[0]) &&
+            args[0].type === 131072 /* TypeTag.Symbol */) {
+            const symbol = {
+                type: "Identifier",
+                name: args[0].value,
+            };
+            const next = {
+                type: "MemberExpression",
+                object: symbol,
+                property: symbol,
+                computed: false,
+            };
+            const [, trueDecls] = findObjectDeclsByProperty(state, calleeObj, next);
+            if (!trueDecls)
+                return ret;
+            const callees = trueDecls
+                .flatMap((decl) => decl.decls?.[symbol.name])
+                .filter((decl) => decl?.type === "FunctionDeclaration");
+            if (!callees.length)
+                return ret;
+            ret.returnType = callees.reduce((type, callee) => {
+                const result = callee.node.returnType
+                    ? typeFromTypespec(state, callee.node.returnType.argument, callee.stack)
+                    : { type: 524287 /* TypeTag.Any */ };
+                const args = callee.node.params.map((param) => param.type === "BinaryExpression"
+                    ? typeFromTypespec(state, param.right, callee.stack)
+                    : { type: 524287 /* TypeTag.Any */ });
+                unionInto(type, {
+                    type: 2048 /* TypeTag.Method */,
+                    value: { result, args },
+                });
+                return type;
+            }, { type: 0 /* TypeTag.Never */ });
+        }
+        return ret;
+    };
     const nop = () => ({ effectFree: true });
     const mod = () => ({});
-    const rounder = (callee, calleeObj, getArgs) => {
+    const rounder = (state, callee, calleeObj, getArgs) => {
         const results = {};
         const fn = Math[callee.name];
         results.effectFree = true;
@@ -10920,7 +10975,7 @@ function getSystemCallTable() {
             : { type: 120 /* TypeTag.Numeric */ };
         return results;
     };
-    const mathHelper = (callee, calleeObj, getArgs, helper) => {
+    const mathHelper = (state, callee, calleeObj, getArgs, helper) => {
         const results = {};
         const fn = helper && typeof helper === "function"
             ? helper
@@ -10979,6 +11034,7 @@ function getSystemCallTable() {
         "$.Toybox.Lang.Dictionary.toString": nop,
         "$.Toybox.Lang.Dictionary.values": dictionaryValues,
         "$.Toybox.Lang.Method.invoke": methodInvoke,
+        "$.Toybox.Lang.Object.method": method,
         "$.Toybox.Math.acos": mathHelper,
         "$.Toybox.Math.asin": mathHelper,
         "$.Toybox.Math.atan": mathHelper,
@@ -10986,15 +11042,15 @@ function getSystemCallTable() {
         "$.Toybox.Math.ceil": rounder,
         "$.Toybox.Math.cos": mathHelper,
         "$.Toybox.Math.floor": rounder,
-        "$.Toybox.Math.ln": (callee, calleeObj, getArgs) => mathHelper(callee, calleeObj, getArgs, "log"),
-        "$.Toybox.Math.log": (callee, calleeObj, getArgs) => mathHelper(callee, calleeObj, getArgs, (x, base) => Math.log(x) / Math.log(base)),
+        "$.Toybox.Math.ln": (state, callee, calleeObj, getArgs) => mathHelper(state, callee, calleeObj, getArgs, "log"),
+        "$.Toybox.Math.log": (state, callee, calleeObj, getArgs) => mathHelper(state, callee, calleeObj, getArgs, (x, base) => Math.log(x) / Math.log(base)),
         "$.Toybox.Math.pow": mathHelper,
         "$.Toybox.Math.round": rounder,
         "$.Toybox.Math.sin": mathHelper,
         "$.Toybox.Math.sqrt": mathHelper,
         "$.Toybox.Math.tan": mathHelper,
-        "$.Toybox.Math.toDegrees": (callee, calleeObj, getArgs) => mathHelper(callee, calleeObj, getArgs, (arg) => (arg * 180) / Math.PI),
-        "$.Toybox.Math.toRadians": (callee, calleeObj, getArgs) => mathHelper(callee, calleeObj, getArgs, (arg) => (arg * Math.PI) / 180),
+        "$.Toybox.Math.toDegrees": (state, callee, calleeObj, getArgs) => mathHelper(state, callee, calleeObj, getArgs, (arg) => (arg * 180) / Math.PI),
+        "$.Toybox.Math.toRadians": (state, callee, calleeObj, getArgs) => mathHelper(state, callee, calleeObj, getArgs, (arg) => (arg * Math.PI) / 180),
         "$.Toybox.Math.mean": nop,
         "$.Toybox.Math.mode": nop,
         "$.Toybox.Math.stdev": nop,
@@ -12391,7 +12447,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, logThisRun) {
             const info = sysCallInfo(callee);
             if (!info)
                 return false;
-            const result = info(callee, calleeObj, () => node.arguments.map((arg) => evaluateExpr(state, arg, typeMap).value));
+            const result = info(istate.state, callee, calleeObj, () => node.arguments.map((arg) => evaluateExpr(state, arg, typeMap).value));
             if (result.calleeObj) {
                 setStateEvent(curState, calleeObjDecl, result.calleeObj, false);
             }
@@ -15325,7 +15381,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
         // 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 && 1674683508654 < opt_time) {
+        if (source_time < opt_time && 1674707539512 < opt_time) {
             return { hasTests, diagnostics: prevDiagnostics };
         }
     }
@@ -15352,7 +15408,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             return promises_namespaceObject.writeFile(external_path_.join(output, "build-info.json"), JSON.stringify({
                 hasTests,
                 diagnostics,
-                optimizerVersion: "1.1.5",
+                optimizerVersion: "1.1.6",
                 ...Object.fromEntries(configOptionsToCheck.map((option) => [option, config[option]])),
             }))
                 .then(() => ({ hasTests, diagnostics }));

package/build/src/type-flow/interp-call.d.ts

@@ -1,5 +1,5 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-import { FunctionStateNode } from "src/optimizer-types";
+import { FunctionStateNode, ProgramStateAnalysis } from "../optimizer-types";
 import { InterpStackElem, InterpState } from "./interp";
 import { ExactOrUnion } from "./types";
 export declare function evaluateCall(istate: InterpState, node: mctree.CallExpression, callee: ExactOrUnion, args: ExactOrUnion[]): InterpStackElem;
@@ -11,6 +11,6 @@ declare type SysCallHelperResult = {
     effectFree?: true;
     argEffects?: true;
 };
-declare type SysCallHelper = (func: FunctionStateNode, calleeObj: ExactOrUnion, getArgs: () => Array<ExactOrUnion>) => SysCallHelperResult;
+declare type SysCallHelper = (state: ProgramStateAnalysis, func: FunctionStateNode, calleeObj: ExactOrUnion, getArgs: () => Array<ExactOrUnion>) => SysCallHelperResult;
 export declare function sysCallInfo(func: FunctionStateNode): SysCallHelper | null;
 export {};

package/package.json

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