@markw65/monkeyc-optimizer 1.1.8 → 1.1.10

package/build/src/api.d.ts

@@ -26,7 +26,7 @@ export declare function findNamesInScope(declStack: StateNode[][], pattern: stri
     parent: StateNode;
     depth: number;
 }][];
-export declare function mapVarDeclsByType(state: ProgramStateAnalysis, decls: StateNodeDecl[], node: mctree.Node, typeMap: TypeMap | null | undefined): (ModuleStateNode | FunctionStateNode | ClassStateNode | TypedefStateNode | ProgramStateNode | EnumStateNode | mctree.EnumStringMember | mctree.Identifier | mctree.AsIdentifier | import("./optimizer-types").BlockStateNode | VariableStateNode)[];
+export declare function mapVarDeclsByType(state: ProgramStateAnalysis, decls: StateNodeDecl[], node: mctree.Node, typeMap: TypeMap | null | undefined): (ModuleStateNode | FunctionStateNode | ClassStateNode | TypedefStateNode | ProgramStateNode | import("./optimizer-types").BlockStateNode | VariableStateNode | EnumStateNode | mctree.EnumStringMember | mctree.Identifier | mctree.AsIdentifier)[];
 export declare function formatAstLongLines(node: mctree.Node): string;
 export declare function createDocumentationMap(functionDocumentation: {
     name: string;
@@ -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/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;
 };
@@ -47,7 +48,7 @@ export declare enum FlowKind {
     INSTANCEOF = 6,
     NOTINSTANCE = 7
 }
-interface FlowEventDecl extends BaseEvent {
+export interface FlowEventDecl extends BaseEvent {
     type: "flw";
     node: mctree.BinaryExpression | mctree.UnaryExpression;
     decl?: undefined;
@@ -56,7 +57,7 @@ interface FlowEventDecl extends BaseEvent {
     right_decl: EventDecl;
     right_node?: undefined;
 }
-interface FlowEventNode extends BaseEvent {
+export interface FlowEventNode extends BaseEvent {
     type: "flw";
     node: mctree.BinaryExpression | mctree.UnaryExpression;
     decl?: undefined;
@@ -65,7 +66,7 @@ interface FlowEventNode extends BaseEvent {
     right_decl?: undefined;
     right_node: mctree.Expression;
 }
-interface FlowEventTruthy extends BaseEvent {
+export interface FlowEventTruthy extends BaseEvent {
     type: "flw";
     node: mctree.Node;
     decl?: undefined;
@@ -74,7 +75,7 @@ interface FlowEventTruthy extends BaseEvent {
     right_decl?: undefined;
     right_node?: undefined;
 }
-interface FlowEventInstanceof extends BaseEvent {
+export interface FlowEventInstanceof extends BaseEvent {
     type: "flw";
     node: mctree.InstanceofExpression | mctree.UnaryExpression;
     decl?: undefined;
@@ -106,4 +107,3 @@ export declare class DataflowQueue {
     dequeue(): DataFlowBlock;
     empty(): boolean;
 }
-export {};

package/build/src/inliner.d.ts

@@ -5,6 +5,7 @@ export declare function shouldInline(state: ProgramStateAnalysis, func: Function
 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.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

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

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

@@ -0,0 +1,2 @@
+import { FunctionStateNode, ProgramStateAnalysis } from "../optimizer-types";
+export declare function minimizeLocals(state: ProgramStateAnalysis, func: FunctionStateNode): void;

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

@@ -1,6 +1,8 @@
 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;
@@ -14,3 +16,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): [StateNode[], StateNode[]] | readonly [null, null];
+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.d.ts

@@ -1,12 +1,18 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-import { FunctionStateNode, ProgramStateAnalysis, StateNode } from "./optimizer-types";
+import { EventDecl } from "./data-flow";
+import { FunctionStateNode, ProgramStateAnalysis } from "./optimizer-types";
 import { InterpState } from "./type-flow/interp";
-import { ExactOrUnion } from "./type-flow/types";
+import { TypeStateKey } from "./type-flow/type-flow-util";
 export declare const missingNullWorkaround = true;
+export declare type NodeEquivMap = Map<mctree.Node, {
+    decl: EventDecl;
+    equiv: Array<EventDecl>;
+}>;
 export declare function buildTypeInfo(state: ProgramStateAnalysis, func: FunctionStateNode, optimizeEquivalencies: boolean): InterpState | 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;
+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>;
+    localConflicts: Map<TypeStateKey, Set<TypeStateKey>> | null;
+    locals: Set<TypeStateKey>;
+    identifiers: Set<string>;
+    logThisRun: boolean;
+} | undefined;

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.8",
+  "version": "1.1.10",
   "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.42"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.43"
   },
   "devDependencies": {
     "@types/chai": "^4.3.4",