@markw65/monkeyc-optimizer 1.0.28 → 1.0.29

package/build/src/api.d.ts

@@ -1,10 +1,8 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-import { traverseAst } from "./ast";
+import { traverseAst, hasProperty } from "./ast";
 export { visitReferences } from "./visitor";
-export { traverseAst };
+export { traverseAst, hasProperty };
 export declare function getApiMapping(state?: ProgramState, barrelList?: string[]): Promise<ProgramStateNode | null>;
-export declare function hasProperty<T extends null extends T ? unknown : undefined extends T ? unknown : never>(obj: T, prop: string): obj is NonNullable<T>;
-export declare function hasProperty<T>(obj: T, prop: string): boolean;
 export declare function isStateNode(node: StateNodeDecl): node is StateNode;
 export declare function variableDeclarationName(node: mctree.TypedIdentifier | mctree.InstanceofIdentifier): string;
 export declare function sameLookupResult(a: LookupDefinition[], b: LookupDefinition[]): boolean;

package/build/src/ast.d.ts

@@ -1,2 +1,9 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 export declare function traverseAst(node: mctree.Node, pre?: null | ((node: mctree.Node) => void | null | false | (keyof mctree.NodeAll)[]), post?: (node: mctree.Node) => void | null | false | mctree.Node | mctree.Node[]): false | void | null | mctree.Node | mctree.Node[];
+export declare function isStatement(node: mctree.Node): node is mctree.Statement;
+export declare function isExpression(node: mctree.Node): node is mctree.Expression;
+export declare function mayThrow(node: mctree.Node): boolean;
+export declare function hasProperty<T extends null extends T ? unknown : undefined extends T ? unknown : never>(obj: T, prop: string): obj is NonNullable<T>;
+export declare function hasProperty<T>(obj: T, prop: string): boolean;
+export declare function withLoc<T extends mctree.Node>(node: T, start: mctree.Node | null, end?: mctree.Node | undefined): T;
+export declare function withLocDeep<T extends mctree.Node>(node: T, start: mctree.Node | null, end?: mctree.Node | undefined): T;

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

@@ -0,0 +1,20 @@
+import { mctree } from "@markw65/prettier-plugin-monkeyc";
+export declare type BaseEvent = {
+    type: string;
+    mayThrow: boolean;
+};
+declare type EventConstraint<_T> = BaseEvent;
+export declare type Block<T extends EventConstraint<T>> = {
+    node?: mctree.Node;
+    preds?: Block<T>[];
+    succs?: Block<T>[];
+    expreds?: Block<T>[];
+    exsucc?: 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) => 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>[];
+export declare function getPreOrder<T extends EventConstraint<T>>(head: Block<T>): Block<T>[];
+export {};

package/build/src/inliner.d.ts

@@ -1,10 +1,10 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 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(expression: mctree.ExpressionStatement["expression"]): mctree.ExpressionStatement[];
-export declare function unused(expression: mctree.ExpressionStatement["expression"], top: true): mctree.ExpressionStatement[] | null;
+export declare function unused(expression: mctree.ExpressionStatement["expression"]): mctree.Statement[];
+export declare function unused(expression: mctree.ExpressionStatement["expression"], top: true): mctree.Statement[] | null;
 export declare function diagnostic(state: ProgramStateLive, loc: mctree.Node["loc"], message: string | null, type?: NonNullable<ProgramStateAnalysis["diagnostics"]>[string][number]["type"]): void;
-export declare type InlineContext = mctree.ReturnStatement | mctree.AssignmentExpression | mctree.ExpressionStatement;
+export declare type InlineContext = mctree.ReturnStatement | 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;
 export {};

package/build/src/mc-rewrite.d.ts

@@ -2,7 +2,7 @@ import { mctree } from "@markw65/prettier-plugin-monkeyc";
 export declare function getFileSources(fnMap: FilesToOptimizeMap): Promise<void>;
 export declare function getFileASTs(fnMap: FilesToOptimizeMap): Promise<boolean>;
 export declare function analyze(fnMap: FilesToOptimizeMap, barrelList?: string[], config?: BuildConfig): Promise<ProgramStateAnalysis>;
-export declare function getLiteralFromDecls(lookupDefns: LookupDefinition[]): null;
+export declare function getLiteralFromDecls(lookupDefns: LookupDefinition[]): mctree.Literal | mctree.AsExpression | null;
 export declare function getLiteralNode(node: mctree.Node | null | undefined): null | mctree.Literal | mctree.AsExpression;
 export declare function optimizeMonkeyC(fnMap: FilesToOptimizeMap, barrelList?: string[], config?: BuildConfig): Promise<Record<string, {
     type: DiagnosticType;

package/build/src/optimizer.d.ts

@@ -37,6 +37,7 @@ declare global {
         returnCommand?: boolean;
         checkBuildPragmas?: boolean;
         checkInvalidSymbols?: DiagnosticType | "OFF";
+        sizeBasedPRE?: boolean | string;
         _cache?: {
             barrels?: Record<string, ResolvedJungle>;
             barrelMap?: Record<string, Record<string, ResolvedJungle>>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -37,11 +37,12 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.29"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.32"
   },
   "devDependencies": {
     "@types/glob": "^7.2.0",
     "@types/prettier": "^2.6.1",
+    "@types/priorityqueuejs": "^1.0.1",
     "@types/xml2js": "^0.4.11",
     "@typescript-eslint/eslint-plugin": "^5.28.0",
     "@typescript-eslint/parser": "^5.28.0",
@@ -51,6 +52,7 @@
     "peggy": "^1.2.0",
     "prettier": "^2.6.2",
     "prettier-plugin-pegjs": "^0.5.0",
+    "priorityqueuejs": "^2.0.0",
     "ts-loader": "^9.3.0",
     "typescript": "^4.6.4",
     "webpack": "^5.72.0",