@markw65/monkeyc-optimizer 1.1.2 → 1.1.4

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

@@ -1,29 +1,6 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-import { ClassStateNode, EnumStateNode, FunctionStateNode, ModuleStateNode, ProgramStateAnalysis, ProgramStateStack, StateNodeDecl, TypedefStateNode } from "../optimizer-types";
-/**
- * TypeBit gives the position of the 1 bit in TypeTag
- */
-export declare enum TypeBit {
-    Null = 0,
-    False = 1,
-    True = 2,
-    Number = 3,
-    Long = 4,
-    Float = 5,
-    Double = 6,
-    Char = 7,
-    String = 8,
-    Array = 9,
-    Dictionary = 10,
-    Module = 11,
-    Function = 12,
-    Class = 13,
-    Object = 14,
-    Enum = 15,
-    Symbol = 16,
-    Typedef = 17
-}
-export declare enum TypeTag {
+import { ClassStateNode, EnumStateNode, FunctionStateNode, ModuleStateNode, ProgramStateAnalysis, ProgramStateStack, StateNode, StateNodeDecl, TypedefStateNode } from "../optimizer-types";
+export declare const enum TypeTag {
     Never = 0,
     Null = 1,
     False = 2,
@@ -33,35 +10,51 @@ export declare enum TypeTag {
     Long = 16,
     Float = 32,
     Double = 64,
+    Decimal = 96,
     Numeric = 120,
     Char = 128,
     String = 256,
     Array = 512,
     Dictionary = 1024,
-    Module = 2048,
-    Function = 4096,
-    Class = 8192,
-    Object = 16384,
-    Enum = 32768,
-    Symbol = 65536,
-    Typedef = 131072,
-    Any = 262143
-}
+    Method = 2048,
+    Module = 4096,
+    Function = 8192,
+    Class = 16384,
+    Object = 32768,
+    Enum = 65536,
+    Symbol = 131072,
+    Typedef = 262144,
+    Any = 524287
+}
+export declare function typeTagName(tag: TypeTag): "Object" | "Number" | "Float" | "Double" | "Long" | "String" | "Char" | "Boolean" | "Null" | "Never" | "False" | "True" | "Decimal" | "Numeric" | "Array" | "Dictionary" | "Method" | "Module" | "Function" | "Class" | "Enum" | "Symbol" | "Typedef" | "Any";
+export declare const LastTypeTag = TypeTag.Typedef;
 export declare const SingleTonTypeTagsConst: number;
 export declare const UnionDataTypeTagsConst: number;
 export declare const ValueTypeTagsConst: number;
 export declare const ObjectLikeTagsConst: number;
-declare type ExactTypeTags = TypeTag.Null | TypeTag.False | TypeTag.True | TypeTag.Number | TypeTag.Long | TypeTag.Float | TypeTag.Double | TypeTag.Char | TypeTag.String | TypeTag.Array | TypeTag.Dictionary | TypeTag.Module | TypeTag.Function | TypeTag.Class | TypeTag.Object | TypeTag.Enum | TypeTag.Symbol | TypeTag.Typedef;
+export declare const EnumTagsConst: number;
+declare type ExactTypeTags = TypeTag.Null | TypeTag.False | TypeTag.True | TypeTag.Number | TypeTag.Long | TypeTag.Float | TypeTag.Double | TypeTag.Char | TypeTag.String | TypeTag.Array | TypeTag.Dictionary | TypeTag.Method | TypeTag.Module | TypeTag.Function | TypeTag.Class | TypeTag.Object | TypeTag.Enum | TypeTag.Symbol | TypeTag.Typedef;
 export declare type EnumeratedTypeTags = ExactTypeTags | TypeTag.Never | TypeTag.Any;
 export declare type UnionTypeTags = number;
 interface AbstractValue {
     type: UnionTypeTags;
     value?: unknown;
 }
-export declare type ExactTypes = NullType | FalseType | TrueType | NumberType | LongType | FloatType | DoubleType | CharType | StringType | ArrayType | DictionaryType | ModuleType | FunctionType | ClassType | ObjectType | EnumType | SymbolType | TypedefType;
-declare type WithValue<T> = T extends ExactTypes ? T extends SingletonType ? T : T & {
+export declare type ExactTypes = NullType | FalseType | TrueType | NumberType | LongType | FloatType | DoubleType | CharType | StringType | ArrayType | DictionaryType | MethodType | ModuleType | FunctionType | ClassType | ObjectType | EnumType | SymbolType | TypedefType;
+declare type ExactPairHelper<T> = T extends ExactTypes ? {
+    type: T["type"];
+    avalue: T["value"];
+    bvalue: T["value"];
+} : never;
+export declare type ExactPairs = ExactPairHelper<ExactTypes>;
+export declare type ValuePairs = ExactPairHelper<ValueTypes>;
+declare type WithValue<T> = T extends ExactTypes ? T extends SingletonType ? T : {
+    type: T["type"];
     value: NonNullable<T["value"]>;
 } : never;
+export declare type ExactData<T extends ExactTypeTags> = T extends SingletonType ? undefined : NonNullable<Extract<ExactTypes, {
+    type: T;
+}>["value"]>;
 export declare type ValueTypes = WithValue<ExactTypes>;
 export declare type ExtendedTypes = ExactTypes | NeverType | AnyType;
 export interface NeverType extends AbstractValue {
@@ -115,6 +108,13 @@ export interface DictionaryType extends AbstractValue {
         value: ExactOrUnion;
     } | undefined;
 }
+export interface MethodType extends AbstractValue {
+    type: TypeTag.Method;
+    value?: {
+        args: ExactOrUnion[];
+        result: ExactOrUnion;
+    } | undefined;
+}
 export interface ModuleType extends AbstractValue {
     type: TypeTag.Module;
     value?: ModuleStateNode | ModuleStateNode[] | undefined;
@@ -143,6 +143,9 @@ export interface EnumType extends AbstractValue {
     value?: {
         enum: EnumStateNode;
         value?: ExactOrUnion | undefined;
+    } | {
+        enum?: undefined;
+        value: ExactOrUnion;
     } | undefined;
 }
 export interface SymbolType extends AbstractValue {
@@ -150,7 +153,7 @@ export interface SymbolType extends AbstractValue {
     value?: string | undefined;
 }
 export interface AnyType extends AbstractValue {
-    type: -1;
+    type: TypeTag.Any;
     value?: undefined;
 }
 export declare type SingletonType = NullType | FalseType | TrueType;
@@ -158,6 +161,7 @@ export declare type UnionData = {
     mask: TypeTag;
     [TypeTag.Array]?: NonNullable<ArrayType["value"]>;
     [TypeTag.Dictionary]?: NonNullable<DictionaryType["value"]>;
+    [TypeTag.Method]?: NonNullable<MethodType["value"]>;
     [TypeTag.Module]?: NonNullable<ModuleType["value"]>;
     [TypeTag.Function]?: NonNullable<FunctionType["value"]>;
     [TypeTag.Class]?: NonNullable<ClassType["value"]>;
@@ -173,20 +177,17 @@ export declare type SingleValue = NonNullable<ValueTypes["value"]>;
 declare type TagValue<TAG> = Extract<ValueTypes, {
     type: TAG;
 }>["value"];
-export declare type ArrayValueType = TagValue<TypeTag.Array>;
-export declare type DictionaryValueType = TagValue<TypeTag.Dictionary>;
-export declare type ObjectValueType = TagValue<TypeTag.Object>;
 export declare type EnumValueType = TagValue<TypeTag.Enum>;
-export declare type TypedefValueType = TagValue<TypeTag.Typedef>;
-export declare type StateDeclValueType = TagValue<TypeTag.Module> | TagValue<TypeTag.Function> | TagValue<TypeTag.Class>;
 export declare function isExact(v: AbstractValue): v is ExactTypes;
 export declare function isUnion(v: AbstractValue): v is UnionType;
 export declare function isSingleton(v: AbstractValue): v is SingletonType;
 export declare function hasValue(v: AbstractValue): v is WithValue<ExactTypes>;
 export declare function hasNoData(v: AbstractValue, t: TypeTag): boolean;
+export declare function lookupByFullName(state: ProgramStateAnalysis, fullName: string): StateNodeDecl[];
 export declare function cloneType<T extends ExactOrUnion>(t: T): T;
 export declare function typeFromTypeStateNode(state: ProgramStateAnalysis, sn: StateNodeDecl, classVsObj?: boolean): ExactOrUnion;
 export declare function typeFromTypeStateNodes(state: ProgramStateAnalysis, sns: StateNodeDecl[], classVsObj?: boolean): ExactOrUnion;
+export declare function typeFromSingleTypeSpec(state: ProgramStateAnalysis, type: mctree.TypeSpecPart | mctree.ObjectExpression, stack?: ProgramStateStack | undefined): ExactOrUnion;
 export declare function typeFromTypespec(state: ProgramStateAnalysis, ts: mctree.TypeSpecList, stack?: ProgramStateStack | undefined): ExactOrUnion;
 export declare function typeFromLiteral(literal: mctree.Literal): ExactTypes;
 export declare function mcExprFromType(type: ValueTypes): mctree.Expression | null;
@@ -197,6 +198,8 @@ export declare function mustBeFalse(arg: ExactOrUnion): boolean;
 export declare function display(type: ExactOrUnion): string;
 export declare function hasUnionData(tag: TypeTag): boolean;
 export declare function getObjectValue(t: ExactOrUnion): ObjectType["value"] | null;
-export declare function forEachUnionComponent(v: ExactOrUnion, bits: TypeTag, fn: (tag: UnionDataKey, value: SingleValue | null | undefined) => boolean | void): void;
-export declare function getUnionComponent(v: ExactOrUnion, tag: TypeTag): SingleValue | null;
+export declare function forEachUnionComponent(v: ExactOrUnion, bits: TypeTag, fn: (type: ExactTypes) => boolean | void): void;
+export declare function getUnionComponent<T extends ExactTypeTags>(v: ExactOrUnion, tag: T): ExactData<T> | null;
+export declare function setUnionComponent<T extends ExactTypeTags>(v: ExactOrUnion, tag: T, c: ExactData<T>): void;
+export declare function getStateNodeDeclsFromType(state: ProgramStateAnalysis, object: ExactOrUnion): StateNode[];
 export {};

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

@@ -1,3 +1,4 @@
 import { ExactOrUnion, TypeTag } from "./types";
 export declare function unionInto(to: ExactOrUnion, from: ExactOrUnion): boolean;
 export declare function clearValuesUnder(v: ExactOrUnion, tag: TypeTag, clearTag?: boolean): void;
+export declare function widenType(t: ExactOrUnion): null;

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

@@ -1,3 +1,12 @@
-import { FunctionStateNode, ProgramStateAnalysis } from "./optimizer-types";
+import { mctree } from "@markw65/prettier-plugin-monkeyc";
+import { FunctionStateNode, ProgramStateAnalysis, StateNode } from "./optimizer-types";
 import { InterpState } from "./type-flow/interp";
-export declare function buildTypeInfo(state: ProgramStateAnalysis, func: FunctionStateNode): InterpState | undefined;
+import { ExactOrUnion } from "./type-flow/types";
+export declare const missingNullWorkaround = true;
+export declare function buildTypeInfo(state: ProgramStateAnalysis, func: FunctionStateNode, optimizeEquivalencies: boolean): InterpState | undefined;
+export declare function findObjectDeclsByProperty(state: ProgramStateAnalysis, object: ExactOrUnion, next: mctree.DottedMemberExpression): StateNode[] | null;
+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/unused-exprs.d.ts

@@ -1,3 +1,3 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { ProgramStateOptimizer } from "./optimizer-types";
-export declare function cleanupUnusedVars(state: ProgramStateOptimizer, node: mctree.BlockStatement | mctree.ForStatement): void;
+export declare function cleanupUnusedVars(state: ProgramStateOptimizer, node: mctree.BlockStatement | mctree.ForStatement): boolean;

package/build/src/util.d.ts

@@ -7,8 +7,8 @@ export declare function globSome(pattern: string, predicate: (path: string) => b
 }): Promise<boolean>;
 export declare function forEach<T>(val: T | T[] | null | undefined, fn: (v: T) => void): void;
 export declare function map<T, U>(val: T | T[] | null | undefined, fn: (v: T) => U): U[];
-export declare function every<T>(val: T | T[] | null | undefined, fn: (v: T) => void): boolean | void;
-export declare function some<T>(val: T | T[] | null | undefined, fn: (v: T) => void): boolean | void;
+export declare function every<T>(val: T | T[] | null | undefined, fn: (v: T) => boolean): boolean;
+export declare function some<T>(val: T | T[] | null | undefined, fn: (v: T) => boolean): boolean;
 export declare function reduce<T, U>(val: T | T[] | null | undefined, fn: (p: U, v: T) => U, init: U): U;
 export declare function last_modified(inputs: string[]): Promise<number>;
 export declare function first_modified(inputs: string[]): Promise<number>;
@@ -21,3 +21,4 @@ export declare function spawnByLine(command: string, args: string[], lineHandler
 export declare function readByLine(file: string, lineHandler: LineHandler): Promise<unknown>;
 export declare function promiseAll<T>(promiseFn: (i: number) => Promise<T> | null, parallelism: number): Promise<T[]>;
 export declare function copyRecursiveAsNeeded(source: string, target: string, filter?: (src: string, tgt: string) => boolean): Promise<void>;
+export declare function popcount(x: number): number;

package/build/src/visitor.d.ts

@@ -1,4 +1,5 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { LookupDefinition, ProgramStateAnalysis } from "./optimizer-types";
+import { TypeMap } from "./type-flow/interp";
 export declare function visitorNode(node: mctree.Node): mctree.Node;
-export declare function visitReferences(state: ProgramStateAnalysis, ast: mctree.Program, name: string | null, defn: LookupDefinition[] | null | false, callback: (node: mctree.Node, results: LookupDefinition[], error: boolean) => undefined | false, includeDefs?: boolean, filter?: ((node: mctree.Node) => boolean) | null): void;
+export declare function visitReferences(state: ProgramStateAnalysis, ast: mctree.Program, name: string | null, defn: LookupDefinition[] | null | false, callback: (node: mctree.Node, results: LookupDefinition[], error: boolean) => undefined | false, includeDefs?: boolean, filter?: ((node: mctree.Node) => boolean) | null, typeMap?: TypeMap | null): void;

package/build/src/worker-task.d.ts

@@ -24,14 +24,7 @@ export declare const workerTaskHandlers: {
         program: string;
         product: string | null;
         hasTests: boolean;
-        diagnostics: Record<string, {
-            type: import("./optimizer-types").DiagnosticType;
-            loc: {
-                start: import("@markw65/prettier-plugin-monkeyc/build/estree-types").Position;
-                end: import("@markw65/prettier-plugin-monkeyc/build/estree-types").Position;
-            };
-            message: string;
-        }[]> | undefined;
+        diagnostics: Record<string, import("./optimizer-types").Diagnostic[]> | undefined;
     }>;
     readonly generateOptimizedProject: (data: GenerateOptimizedProject["data"]) => Promise<{
         jungleFiles: string | undefined;
@@ -44,14 +37,7 @@ export declare const workerTaskHandlers: {
         xml: import("./xml-util").Document;
         program: string;
         hasTests: boolean;
-        diagnostics: Record<string, {
-            type: import("./optimizer-types").DiagnosticType;
-            loc: {
-                start: import("@markw65/prettier-plugin-monkeyc/build/estree-types").Position;
-                end: import("@markw65/prettier-plugin-monkeyc/build/estree-types").Position;
-            };
-            message: string;
-        }[]>;
+        diagnostics: Record<string, import("./optimizer-types").Diagnostic[]>;
     }>;
 };
 declare type RemovePromise<T> = T extends Promise<infer U> ? U : T;

package/build/util.cjs

@@ -1,4 +1,4 @@
-0 && (module.exports = {copyRecursiveAsNeeded,every,first_modified,forEach,globSome,globa,last_modified,map,promiseAll,pushUnique,readByLine,reduce,sameArrays,some,spawnByLine});
+0 && (module.exports = {copyRecursiveAsNeeded,every,first_modified,forEach,globSome,globa,last_modified,map,popcount,promiseAll,pushUnique,readByLine,reduce,sameArrays,some,spawnByLine});
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
@@ -7720,6 +7720,7 @@ __webpack_require__.d(__webpack_exports__, {
   "globa": () => (/* binding */ globa),
   "last_modified": () => (/* binding */ last_modified),
   "map": () => (/* binding */ map),
+  "popcount": () => (/* binding */ popcount),
   "promiseAll": () => (/* binding */ promiseAll),
   "pushUnique": () => (/* binding */ pushUnique),
   "readByLine": () => (/* binding */ readByLine),
@@ -7872,7 +7873,7 @@ function spawnByLine(command, args, lineHandlers, options) {
         rle.on("line", errHandler);
         rl.on("line", lineHandler);
         proc.on("close", (code) => {
-            if (code == 0)
+            if (code === 0)
                 resolve();
             reject(code);
         });
@@ -7944,6 +7945,14 @@ async function copyRecursiveAsNeeded(source, target, filter) {
         }
     }
 }
+function popcount(x) {
+    x -= (x >> 1) & 0x55555555;
+    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+    x = (x + (x >> 4)) & 0x0f0f0f0f;
+    x += x >> 8;
+    x += x >> 16;
+    return x & 0x7f;
+}
 
 })();
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "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.41"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.42"
   },
   "devDependencies": {
     "@types/chai": "^4.3.4",