@markw65/monkeyc-optimizer 1.1.9 → 1.1.11

package/build/src/api.d.ts

@@ -45,6 +45,7 @@ export declare function findUsingForNode(state: ProgramStateLive, stack: Program
 export declare function getApiFunctionInfo(state: ProgramState, func: FunctionStateNode): FunctionInfo | false;
 export declare function markInvokeClassMethod(state: ProgramStateAnalysis, func: FunctionStateNode): void;
 export declare function isLocal(v: VariableStateNode): boolean;
+export declare function isClassVariable(v: VariableStateNode): boolean;
 export declare function diagnostic(state: ProgramState, node: mctree.Node, message: string | null, type?: DiagnosticType, extra?: Diagnostic["extra"]): void;
 export declare function diagnosticHelper(diagnostics: Record<string, Diagnostic[]>, node: mctree.Node, message: string | null, type: DiagnosticType | undefined, extra: Diagnostic["extra"] | undefined, uniqueLocs: boolean): void;
 export declare function getSuperClasses(klass: ClassStateNode): Set<StateNode> | null;

package/build/src/control-flow.d.ts

@@ -14,7 +14,7 @@ export declare type Block<T extends EventConstraint<T>> = {
     bogopred?: Block<T>;
     events?: T[];
 };
-export declare function buildReducedGraph<T extends EventConstraint<T>>(state: ProgramStateAnalysis, func: FunctionStateNode, notice: (node: mctree.Node, stmt: mctree.Node, mayThrow: boolean | 1) => T | T[] | null): Block<T>;
+export declare function buildReducedGraph<T extends EventConstraint<T>>(state: ProgramStateAnalysis, func: FunctionStateNode, refsForUpdate: boolean, notice: (node: mctree.Node, stmt: mctree.Node, mayThrow: boolean | 1, containedEvents: () => T[]) => T | T[] | null): Block<T>;
 export declare function postOrderTraverse<T extends EventConstraint<T>>(head: Block<T>, visitor: (block: Block<T>) => void): void;
 export declare function preOrderTraverse<T extends EventConstraint<T>>(head: Block<T>, visitor: (block: Block<T>) => void): void;
 export declare function getPostOrder<T extends EventConstraint<T>>(head: Block<T>): Block<T>[];

package/build/src/data-flow.d.ts

@@ -2,12 +2,13 @@ import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { BaseEvent, Block } from "./control-flow";
 import { FunctionStateNode, ProgramStateAnalysis, StateNodeDecl } from "./optimizer-types";
 export declare type RefNode = mctree.Identifier | mctree.MemberExpression | mctree.Literal;
-export declare type EventDecl = StateNodeDecl | StateNodeDecl[] | mctree.Literal | {
+export declare type MemberDecl = {
     type: "MemberDecl";
     node: mctree.MemberExpression;
     base: StateNodeDecl | StateNodeDecl[];
     path: mctree.MemberExpression[];
-} | {
+};
+export declare type EventDecl = StateNodeDecl | StateNodeDecl[] | mctree.Literal | MemberDecl | {
     type: "Unknown";
     node: mctree.MemberExpression | mctree.Identifier | mctree.ThisExpression;
 };
@@ -26,6 +27,7 @@ export interface DefEvent extends BaseEvent {
     node: mctree.AssignmentExpression | mctree.UpdateExpression | mctree.VariableDeclarator;
     decl: EventDecl;
     rhs?: EventDecl;
+    containedEvents?: Array<RefEvent | ModEvent>;
 }
 export interface ModEvent extends BaseEvent {
     type: "mod";
@@ -97,7 +99,7 @@ export declare function declName(decl: EventDecl): string | undefined;
 export declare function unhandledType(node: never): never;
 export declare function buildDataFlowGraph(state: ProgramStateAnalysis, func: FunctionStateNode, wantsLiteral: (literal: mctree.Literal) => boolean, trackInsertionPoints: boolean, wantsAllRefs: boolean): {
     identifiers: Set<string>;
-    graph: Block<RefEvent | KillEvent | DefEvent | ModEvent | FlowEventDecl | FlowEventNode | FlowEventTruthy | FlowEventInstanceof | ExnEvent>;
+    graph: Block<Event>;
 };
 export declare class DataflowQueue {
     private enqueued;

package/build/src/inliner.d.ts

@@ -1,10 +1,12 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { FunctionStateNode, ProgramStateAnalysis } from "./optimizer-types";
 export declare function inlinableSubExpression(expr: mctree.Expression): mctree.SimpleCallExpression | null;
+export declare function inlineRequested(state: ProgramStateAnalysis, func: FunctionStateNode): boolean;
 export declare function shouldInline(state: ProgramStateAnalysis, func: FunctionStateNode, call: mctree.CallExpression, context: InlineContext | null): boolean;
 declare type InlineBody = mctree.BlockStatement | mctree.ExpressionStatement["expression"];
 export declare function unused(state: ProgramStateAnalysis, expression: mctree.ExpressionStatement["expression"]): mctree.Statement[];
 export declare function unused(state: ProgramStateAnalysis, expression: mctree.ExpressionStatement["expression"], top: true): mctree.Statement[] | null;
+export declare function inlineDiagnostic(state: ProgramStateAnalysis, func: FunctionStateNode, call: mctree.CallExpression, message: string | null): void;
 export declare type InlineContext = mctree.ReturnStatement | mctree.IfStatement | mctree.AssignmentExpression | mctree.ExpressionStatement | mctree.VariableDeclarator;
 export declare function inlineFunction(state: ProgramStateAnalysis, func: FunctionStateNode, call: mctree.CallExpression, context: InlineContext | null): InlineBody | null;
 export declare function applyTypeIfNeeded(node: mctree.Node): mctree.Node;

package/build/src/optimizer-types.d.ts

@@ -37,6 +37,8 @@ export declare type BuildConfig = {
     useLocalOptimizer?: boolean;
     propagateTypes?: boolean;
     trustDeclaredTypes?: boolean;
+    minimizeLocals?: boolean;
+    singleUseCopyProp?: boolean;
     covarianceWarnings?: boolean;
     checkTypes?: DiagnosticType | "OFF";
 };

package/build/src/optimizer.d.ts

@@ -7,6 +7,7 @@ import { xmlUtil } from "./sdk-util";
 import { TypeMap } from "./type-flow/interp";
 import { copyRecursiveAsNeeded } from "./util";
 export * from "./optimizer-types";
+export { display } from "./type-flow/types";
 export { copyRecursiveAsNeeded, get_jungle, JungleBuildDependencies, JungleError, JungleResourceMap, launchSimulator, manifestProducts, mctree, ResolvedJungle, simulateProgram, };
 export declare const defaultConfig: {
     outputPath: string;

package/build/src/type-flow/could-be.d.ts

@@ -1,3 +1,5 @@
 import { ExactOrUnion } from "./types";
+export declare function couldBeHelper(a: ExactOrUnion, b: ExactOrUnion, shallow: boolean): boolean;
 export declare function couldBe(a: ExactOrUnion, b: ExactOrUnion): boolean;
 export declare function couldBeWeak(a: ExactOrUnion, b: ExactOrUnion): boolean;
+export declare function couldBeShallow(a: ExactOrUnion, b: ExactOrUnion): boolean;

package/build/src/type-flow/dead-store.d.ts

@@ -2,9 +2,17 @@ import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { NodeEquivMap } from "src/type-flow";
 import { FunctionStateNode, ProgramStateAnalysis } from "../optimizer-types";
 import { TypeFlowBlock, TypeStateKey } from "./type-flow-util";
-export declare function findDeadStores(func: FunctionStateNode, graph: TypeFlowBlock, nodeEquivs: NodeEquivMap | null, logThisRun: boolean): {
+export declare type CopyPropStores = Map<mctree.Node, {
+    ref: mctree.Node;
+    ant: boolean;
+}>;
+export declare function findDeadStores(func: FunctionStateNode, graph: TypeFlowBlock, nodeEquivs: NodeEquivMap | null, findCopyPropCandidates: boolean, logThisRun: boolean): {
     deadStores: Set<mctree.Node>;
     locals: Set<TypeStateKey>;
     localConflicts: Map<TypeStateKey, Set<TypeStateKey>> | null;
+    copyPropStores: CopyPropStores;
+};
+export declare function eliminateDeadStores(state: ProgramStateAnalysis, func: FunctionStateNode, graph: TypeFlowBlock, logThisRun: boolean): {
+    changes: boolean;
+    copyPropStores: CopyPropStores;
 };
-export declare function eliminateDeadStores(state: ProgramStateAnalysis, func: FunctionStateNode, graph: TypeFlowBlock, logThisRun: boolean): boolean;

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

@@ -12,5 +12,5 @@ declare type SysCallHelperResult = {
     argEffects?: true;
 };
 declare type SysCallHelper = (state: ProgramStateAnalysis, func: FunctionStateNode, calleeObj: ExactOrUnion, getArgs: () => Array<ExactOrUnion>) => SysCallHelperResult;
-export declare function sysCallInfo(func: FunctionStateNode): SysCallHelper | null;
+export declare function sysCallInfo(state: ProgramStateAnalysis, func: FunctionStateNode): SysCallHelper | null;
 export {};

package/build/src/type-flow/type-flow-util.d.ts

@@ -1,9 +1,12 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { DataFlowBlock as TypeFlowBlock, Event, EventDecl } from "../data-flow";
-import { VariableStateNode } from "../optimizer-types";
+import { ProgramStateAnalysis, StateNode, VariableStateNode } from "../optimizer-types";
+import { InterpState } from "./interp";
+import { ExactOrUnion } from "./types";
 export { TypeFlowBlock };
 export declare function isTypeStateKey(decl: EventDecl): decl is TypeStateKey;
 export declare function declIsLocal(decl: EventDecl): decl is VariableStateNode | VariableStateNode[] | mctree.TypedIdentifier;
+export declare function declIsNonLocal(decl: EventDecl): decl is VariableStateNode | VariableStateNode[];
 export declare function localDeclName(decl: EventDecl): string;
 export declare type TypeStateKey = Exclude<EventDecl, {
     type: "MemberDecl" | "Unknown";
@@ -14,3 +17,11 @@ export declare function printBlockHeader(block: TypeFlowBlock): void;
 export declare function describeEvent(event: Event): string;
 export declare function printBlockEvents(block: TypeFlowBlock, extra?: (event: Event) => string): void;
 export declare function printBlockTrailer(block: TypeFlowBlock): void;
+export declare function findObjectDeclsByProperty(state: ProgramStateAnalysis, object: ExactOrUnion, next: mctree.DottedMemberExpression): readonly [null, null] | [StateNode[], StateNode[]];
+export declare function refineObjectTypeByDecls(istate: InterpState, object: ExactOrUnion, trueDecls: StateNode[]): ExactOrUnion;
+export declare function findNextObjectType(istate: InterpState, trueDecls: StateNode[], next: mctree.DottedMemberExpression): import("./types").UnionType | import("./types").NumberType | import("./types").LongType | import("./types").FloatType | import("./types").DoubleType | import("./types").CharType | import("./types").StringType | import("./types").ArrayType | import("./types").DictionaryType | import("./types").MethodType | import("./types").ModuleType | import("./types").FunctionType | import("./types").ClassType | import("./types").ObjectType | import("./types").EnumType | import("./types").SymbolType | import("./types").TypedefType | null;
+export declare function resolveDottedMember(istate: InterpState, object: ExactOrUnion, next: mctree.DottedMemberExpression): {
+    mayThrow: boolean;
+    object: ExactOrUnion;
+    property: import("./types").UnionType | import("./types").NumberType | import("./types").LongType | import("./types").FloatType | import("./types").DoubleType | import("./types").CharType | import("./types").StringType | import("./types").ArrayType | import("./types").DictionaryType | import("./types").MethodType | import("./types").ModuleType | import("./types").FunctionType | import("./types").ClassType | import("./types").ObjectType | import("./types").EnumType | import("./types").SymbolType | import("./types").TypedefType;
+} | null;

package/build/src/type-flow/types.d.ts

@@ -26,7 +26,7 @@ export declare const enum TypeTag {
     Typedef = 262144,
     Any = 524287
 }
-export declare function typeTagName(tag: TypeTag): "Number" | "Float" | "Double" | "Long" | "String" | "Char" | "Boolean" | "Null" | "Never" | "False" | "True" | "Decimal" | "Numeric" | "Array" | "Dictionary" | "Method" | "Module" | "Function" | "Class" | "Object" | "Enum" | "Symbol" | "Typedef" | "Any";
+export declare function typeTagName(tag: TypeTag): "Never" | "Null" | "False" | "True" | "Boolean" | "Number" | "Long" | "Float" | "Double" | "Decimal" | "Numeric" | "Char" | "String" | "Array" | "Dictionary" | "Method" | "Module" | "Function" | "Class" | "Object" | "Enum" | "Symbol" | "Typedef" | "Any";
 export declare const LastTypeTag = TypeTag.Typedef;
 export declare const SingletonTypeTagsConst: number;
 export declare const UnionDataTypeTagsConst: number;

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

@@ -1,9 +1,8 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-import { EventDecl } from "./data-flow";
-import { FunctionStateNode, ProgramStateAnalysis, StateNode } from "./optimizer-types";
+import { Event, EventDecl } from "./data-flow";
+import { FunctionStateNode, ProgramStateAnalysis } from "./optimizer-types";
 import { InterpState } from "./type-flow/interp";
 import { TypeStateKey } from "./type-flow/type-flow-util";
-import { ExactOrUnion } from "./type-flow/types";
 export declare const missingNullWorkaround = true;
 export declare type NodeEquivMap = Map<mctree.Node, {
     decl: EventDecl;
@@ -11,15 +10,9 @@ export declare type NodeEquivMap = Map<mctree.Node, {
 }>;
 export declare function buildTypeInfo(state: ProgramStateAnalysis, func: FunctionStateNode, optimizeEquivalencies: boolean): InterpState | undefined;
 export declare function buildConflictGraph(state: ProgramStateAnalysis, func: FunctionStateNode): {
-    graph: import("./control-flow").Block<import("./data-flow").RefEvent | import("./data-flow").KillEvent | import("./data-flow").DefEvent | import("./data-flow").ModEvent | import("./data-flow").FlowEventDecl | import("./data-flow").FlowEventNode | import("./data-flow").FlowEventTruthy | import("./data-flow").FlowEventInstanceof | import("./data-flow").ExnEvent>;
+    graph: import("./control-flow").Block<Event>;
     localConflicts: Map<TypeStateKey, Set<TypeStateKey>> | null;
     locals: Set<TypeStateKey>;
     identifiers: Set<string>;
     logThisRun: boolean;
 } | undefined;
-export declare function findObjectDeclsByProperty(state: ProgramStateAnalysis, object: ExactOrUnion, next: mctree.DottedMemberExpression): readonly [null, null] | [StateNode[], StateNode[]];
-export declare function resolveDottedMember(istate: InterpState, object: ExactOrUnion, next: mctree.DottedMemberExpression): {
-    mayThrow: boolean;
-    object: ExactOrUnion;
-    property: import("./type-flow/types").UnionType | import("./type-flow/types").NumberType | import("./type-flow/types").LongType | import("./type-flow/types").FloatType | import("./type-flow/types").DoubleType | import("./type-flow/types").CharType | import("./type-flow/types").StringType | import("./type-flow/types").ArrayType | import("./type-flow/types").DictionaryType | import("./type-flow/types").MethodType | import("./type-flow/types").ModuleType | import("./type-flow/types").FunctionType | import("./type-flow/types").ClassType | import("./type-flow/types").ObjectType | import("./type-flow/types").EnumType | import("./type-flow/types").SymbolType | import("./type-flow/types").TypedefType;
-} | null;

package/build/src/variable-renamer.d.ts

@@ -1,2 +1,4 @@
+import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { ProgramStateAnalysis } from "./optimizer-types";
+export declare function renameIdentifier(ident: mctree.Identifier, newName: string): void;
 export declare function renameVariable(state: ProgramStateAnalysis, locals: NonNullable<ProgramStateAnalysis["localsStack"]>[number], declName: string | null): string | null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -40,7 +40,7 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.43"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.44"
   },
   "devDependencies": {
     "@types/chai": "^4.3.4",