@markw65/monkeyc-optimizer 1.1.8 → 1.1.9

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 | VariableStateNode | import("./optimizer-types").BlockStateNode | EnumStateNode | mctree.EnumStringMember | mctree.Identifier | mctree.AsIdentifier)[];
 export declare function formatAstLongLines(node: mctree.Node): string;
 export declare function createDocumentationMap(functionDocumentation: {
     name: string;

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

@@ -47,7 +47,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 +56,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 +65,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 +74,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 +106,3 @@ export declare class DataflowQueue {
     dequeue(): DataFlowBlock;
     empty(): boolean;
 }
-export {};

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/types.d.ts

@@ -26,7 +26,7 @@ export declare const enum TypeTag {
     Typedef = 262144,
     Any = 524287
 }
-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 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 const LastTypeTag = TypeTag.Typedef;
 export declare const SingletonTypeTagsConst: number;
 export declare const UnionDataTypeTagsConst: number;

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

@@ -1,9 +1,22 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
+import { EventDecl } from "./data-flow";
 import { FunctionStateNode, ProgramStateAnalysis, StateNode } 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;
+    equiv: Array<EventDecl>;
+}>;
 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>;
+    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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "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",