@samitouri / QOS-React-2 / commits / 05d1fe94f9

[be] Split files into directories

Moves _some_ files from HIR into new top-level directories. To not make @gsathya's life a pain I left the files he's touching alone, but I moved some others. My intent is to have something like this: * Babel/ - code for the Babel plugin, though ideally this actually gets split into a separate package and the compiler itself is AST in, AST out w no Babel dep. * HIR/ - the core HIRFunction, HIR and related data types, plus the HIR construction and printing, HIR visitors. * Inference/ - the core inference passes that operate on the HIR, including type inference, reference effects, alias analysis, mutable range analysis, etc. I'll let @gsathya move these files when at a good stopping point. * ReactiveScopes/ - inference relating to reactive scopes, constructing/printing/codegenning ReactiveFunction * SSA/ - enter/leave SSA and eliminate redundant phis * Utils/ - every project needs a place to put stuff that doesn't fit into the other categories, this is ours. This leaves just index.ts at the top level, and overall feels pretty tidy. Not too tedious to figure out where anything goes, hopefully.

Joe Savona committed Dec 16, 2022 at 17:25 UTC 05d1fe94f91fbe03fcdfbe661f677331f9283a14
37 files changed +98 -456
compiler/forget/src/Babel/BabelPlugin.ts renamed
+2 -2
@@ -10,8 +10,8 @@
10 import type * as BabelCore from "@babel/core";
11 import type { PluginObj } from "@babel/core";
12 import jsx from "@babel/plugin-syntax-jsx";
13 -import { invariant } from "./CompilerError";
14 -import Pipeline from "./HIR/Pipeline";
13 +import Pipeline from "../HIR/Pipeline";
14 +import { invariant } from "../Utils/CompilerError";
15
16 /**
17 * The React Forget Babel Plugin
compiler/forget/src/Babel/plugin-syntax-jsx.d.ts renamed
compiler/forget/src/Common/Dumper.ts deleted
-113
@@ -1,113 +0,0 @@
1 -/**
2 - * Copyright (c) Facebook, Inc. and its affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - */
7 -
8 -import * as t from "@babel/types";
9 -import generate from "@babel/generator";
10 -
11 -/**
12 - * Dumper.
13 - */
14 -
15 -const defaultDumpNodeOption = {
16 - // dump with location.
17 - loc: false,
18 -
19 - // dump with the node type.
20 - type: false,
21 -
22 - // dump as the entire source code instead of a shorten name.
23 - source: false,
24 -
25 - // instead of <anno>, fallback to source.
26 - fallbackToSource: true,
27 -};
28 -
29 -type DumpNodeOption = typeof defaultDumpNodeOption;
30 -
31 -export function dumpNodeLoc(node: t.Node): string {
32 - return `${node.loc?.start.line ?? "?"}:${node.loc?.start.column ?? "?"}`;
33 -}
34 -
35 -/**
36 - * Dump a string form of the @param node to help with debugging.
37 - */
38 -export function dumpNode(
39 - node: t.Node | null | undefined,
40 - options: Partial<DumpNodeOption> = defaultDumpNodeOption
41 -): string {
42 - let str = "";
43 - let opt = { ...defaultDumpNodeOption, ...options };
44 -
45 - if (!node) return "";
46 -
47 - if (opt.loc) {
48 - str += `${dumpNodeLoc(node)} `;
49 - }
50 -
51 - if (opt.source) {
52 - str += generate(node).code;
53 - } else {
54 - switch (node.type) {
55 - case "Identifier":
56 - str += node.name;
57 - break;
58 -
59 - case "JSXIdentifier":
60 - str += `${node.name}`;
61 - break;
62 -
63 - case "VariableDeclarator":
64 - str += `${dumpNode(node.id, { source: true })}`;
65 - break;
66 -
67 - case "JSXMemberExpression":
68 - str += `${dumpNode(node.object)}.${dumpNode(node.property)}`;
69 - break;
70 -
71 - case "JSXNamespacedName":
72 - str += `${dumpNode(node.namespace)}:${dumpNode(node.name)}`;
73 - break;
74 -
75 - case "JSXOpeningElement":
76 - str += dumpNode(node.name);
77 - break;
78 -
79 - case "JSXAttribute":
80 - str += dumpNode(node.name);
81 - break;
82 -
83 - case "FunctionDeclaration":
84 - str += `function ${dumpNode(node.id)}`;
85 - break;
86 -
87 - case "JSXFragment":
88 - str += `<>`;
89 - break;
90 -
91 - case "JSXElement":
92 - if (node.selfClosing) {
93 - str += `<${dumpNode(node.openingElement)} />`;
94 - } else {
95 - str += `<${dumpNode(node.openingElement)}>`;
96 - }
97 - break;
98 -
99 - default:
100 - if (opt.fallbackToSource) {
101 - str += "`" + generate(node, { compact: true }).code + "`";
102 - } else {
103 - str += `<anno>`;
104 - }
105 - }
106 - }
107 -
108 - if (opt.type) {
109 - str += ` : ${node.type}`;
110 - }
111 -
112 - return str;
113 -}
compiler/forget/src/Common/PathUnion.ts deleted
-39
@@ -1,39 +0,0 @@
1 -/**
2 - * Copyright (c) Facebook, Inc. and its affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - */
7 -
8 -import { Node, NodePath } from "@babel/traverse";
9 -
10 -/**
11 - * A utility type to generate NodePath as a disjointed union type for better
12 - * type refinement and exhaustiveness check.
13 - *
14 - * @see https://www.typescriptlang.org/docs/handbook/2/conditional-types.html#distributive-conditional-types
15 - */
16 -export type PathUnion<N extends Node | undefined | null> = N extends Node
17 - ? NodePath<N>
18 - : N extends undefined
19 - ? NodePath<undefined>
20 - : N extends null
21 - ? NodePath<null>
22 - : never;
23 -
24 -/**
25 - * Cast @param path of type {@link NodePath} to {@link PathUnion}.
26 - *
27 - * This should only be used right before a type refinement (aka. narrowing):
28 - *
29 - * const path = pathUnion(rawPath)
30 - * switch(path.kind) {
31 - * case "A":
32 - * // path is now refined to NodePath<A>
33 - * }
34 - */
35 -export function pathUnion<N extends Node | null | undefined>(
36 - path: NodePath<N>
37 -): PathUnion<N> {
38 - return path as PathUnion<N>;
39 -}
compiler/forget/src/HIR/BuildHIR.ts
+3 -3
@@ -7,8 +7,9 @@
7
8 import { NodePath } from "@babel/traverse";
9 import * as t from "@babel/types";
10 -import { assertExhaustive } from "../Common/utils";
11 -import { invariant } from "../CompilerError";
10 +import { invariant } from "../Utils/CompilerError";
11 +import todo, { todoInvariant } from "../Utils/todo";
12 +import { assertExhaustive } from "../Utils/utils";
13 import {
14 Effect,
15 GeneratedSource,
@@ -24,7 +25,6 @@ import {
25 ThrowTerminal,
26 } from "./HIR";
27 import HIRBuilder, { Environment } from "./HIRBuilder";
27 -import todo, { todoInvariant } from "./todo";
28
29 // *******************************************************************************************
30 // *******************************************************************************************
compiler/forget/src/HIR/Codegen.ts
+3 -3
@@ -6,8 +6,9 @@
6 */
7
8 import * as t from "@babel/types";
9 -import { assertExhaustive } from "../Common/utils";
10 -import { invariant } from "../CompilerError";
9 +import { invariant } from "../Utils/CompilerError";
10 +import { todoInvariant } from "../Utils/todo";
11 +import { assertExhaustive } from "../Utils/utils";
12 import {
13 BlockId,
14 GeneratedSource,
@@ -23,7 +24,6 @@ import {
24 SourceLocation,
25 } from "./HIR";
26 import { BlockTerminal, Visitor, visitTree } from "./HIRTreeVisitor";
26 -import { todoInvariant } from "./todo";
27
28 function withLoc<TNode extends t.Node, T extends (...args: any[]) => TNode>(
29 fn: T
compiler/forget/src/HIR/HIR.ts
+1 -1
@@ -6,7 +6,7 @@
6 */
7
8 import * as t from "@babel/types";
9 -import { invariant } from "../CompilerError";
9 +import { invariant } from "../Utils/CompilerError";
10
11 // *******************************************************************************************
12 // *******************************************************************************************
compiler/forget/src/HIR/HIRBuilder.ts
+3 -3
@@ -6,8 +6,9 @@
6 */
7
8 import * as t from "@babel/types";
9 -import { assertExhaustive } from "../Common/utils";
10 -import { invariant } from "../CompilerError";
9 +import { invariant } from "../Utils/CompilerError";
10 +import { logHIR } from "../Utils/logger";
11 +import { assertExhaustive } from "../Utils/utils";
12 import {
13 BasicBlock,
14 BlockId,
@@ -23,7 +24,6 @@ import {
24 makeType,
25 Terminal,
26 } from "./HIR";
26 -import { logHIR } from "./logger";
27 import { printInstruction } from "./PrintHIR";
28 import { eachTerminalSuccessor, mapTerminalSuccessors } from "./visitors";
29
compiler/forget/src/HIR/HIRTreeVisitor.ts
+1 -1
@@ -6,7 +6,7 @@
6 */
7
8 import invariant from "invariant";
9 -import { assertExhaustive } from "../Common/utils";
9 +import { assertExhaustive } from "../Utils/utils";
10 import {
11 BasicBlock,
12 BlockId,
compiler/forget/src/HIR/InferAlias.ts
+1 -3
@@ -1,7 +1,5 @@
1 -import invariant from "invariant";
2 -import DisjointSet from "./DisjointSet";
1 +import DisjointSet from "../Utils/DisjointSet";
2 import { HIRFunction, Identifier, Instruction, LValue, Place } from "./HIR";
4 -import { printInstructionValue } from "./PrintHIR";
3
4 export type AliasSet = Set<Identifier>;
5
compiler/forget/src/HIR/InferAliasForFields.ts
+1 -1
@@ -4,7 +4,7 @@
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 */
7 -import DisjointSet from "./DisjointSet";
7 +import DisjointSet from "../Utils/DisjointSet";
8 import { HIRFunction, Identifier } from "./HIR";
9
10 export function inferAliasForFields(
compiler/forget/src/HIR/InferMutableLifetimes.ts
+1 -1
@@ -6,7 +6,7 @@
6 */
7
8 import invariant from "invariant";
9 -import { assertExhaustive } from "../Common/utils";
9 +import { assertExhaustive } from "../Utils/utils";
10 import {
11 Effect,
12 HIRFunction,
compiler/forget/src/HIR/InferMutableRangesForAlias.ts
+1 -1
@@ -1,4 +1,4 @@
1 -import DisjointSet from "./DisjointSet";
1 +import DisjointSet from "../Utils/DisjointSet";
2 import { Identifier, InstructionId } from "./HIR";
3
4 export function inferMutableRangesForAlias(aliases: DisjointSet<Identifier>) {
compiler/forget/src/HIR/InferReferenceEffects.ts
+2 -3
@@ -5,8 +5,8 @@
5 * LICENSE file in the root directory of this source tree.
6 */
7
8 -import { assertExhaustive } from "../Common/utils";
9 -import { invariant } from "../CompilerError";
8 +import { invariant } from "../Utils/CompilerError";
9 +import { assertExhaustive } from "../Utils/utils";
10 import {
11 BasicBlock,
12 BlockId,
@@ -14,7 +14,6 @@ import {
14 HIRFunction,
15 IdentifierId,
16 InstructionValue,
17 - makeType,
17 Phi,
18 Place,
19 ValueKind,
compiler/forget/src/HIR/Pipeline.ts
+12 -12
@@ -7,23 +7,23 @@
7 import { NodePath } from "@babel/traverse";
8 import * as t from "@babel/types";
9 import { lower } from "../HIR/BuildHIR";
10 -import { eliminateRedundantPhi } from "../HIR/EliminateRedundantPhi";
11 -import enterSSA from "../HIR/EnterSSA";
10 import { Environment } from "../HIR/HIRBuilder";
11 import inferReferenceEffects from "../HIR/InferReferenceEffects";
14 -import { leaveSSA } from "../HIR/LeaveSSA";
15 -import { buildReactiveFunction } from "./BuildReactiveFunction";
16 -import { codegenReactiveFunction } from "./CodegenReactiveFunction";
17 -import { flattenReactiveLoops } from "./FlattenReactiveLoops";
12 +import { buildReactiveFunction } from "../ReactiveScopes/BuildReactiveFunction";
13 +import { codegenReactiveFunction } from "../ReactiveScopes/CodegenReactiveFunction";
14 +import { flattenReactiveLoops } from "../ReactiveScopes/FlattenReactiveLoops";
15 +import { inferReactiveScopes } from "../ReactiveScopes/InferReactiveScopes";
16 +import { inferReactiveScopeVariables } from "../ReactiveScopes/InferReactiveScopeVariables";
17 +import { printReactiveFunction } from "../ReactiveScopes/PrintReactiveFunction";
18 +import { propagateScopeDependencies } from "../ReactiveScopes/PropagateScopeDependencies";
19 +import { pruneUnusedLabels } from "../ReactiveScopes/PruneUnusedLabels";
20 +import { eliminateRedundantPhi } from "../SSA/EliminateRedundantPhi";
21 +import enterSSA from "../SSA/EnterSSA";
22 +import { leaveSSA } from "../SSA/LeaveSSA";
23 +import { logHIRFunction } from "../Utils/logger";
24 import { HIRFunction } from "./HIR";
25 import { inferMutableRanges } from "./InferMutableRanges";
20 -import { inferReactiveScopes } from "./InferReactiveScopes";
21 -import { inferReactiveScopeVariables } from "./InferReactiveScopeVariables";
26 import { inferTypes } from "./InferTypes";
23 -import { logHIRFunction } from "./logger";
24 -import { printReactiveFunction } from "./PrintReactiveFunction";
25 -import { propagateScopeDependencies } from "./PropagateScopeDependencies";
26 -import { pruneUnusedLabels } from "./PruneUnusedLabels";
27
28 export type CompilerFlags = {
29 eliminateRedundantPhi: boolean;
compiler/forget/src/HIR/PrintHIR.ts
+2 -2
@@ -6,8 +6,8 @@
6 */
7
8 import generate from "@babel/generator";
9 -import { assertExhaustive } from "../Common/utils";
10 -import DisjointSet from "./DisjointSet";
9 +import DisjointSet from "../Utils/DisjointSet";
10 +import { assertExhaustive } from "../Utils/utils";
11 import {
12 GotoVariant,
13 HIR,
compiler/forget/src/HIR/PrintHIRTree.ts deleted
-173
@@ -1,173 +0,0 @@
1 -/**
2 - * Copyright (c) Facebook, Inc. and its affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - */
7 -
8 -import { assertExhaustive } from "../Common/utils";
9 -import {
10 - BlockId,
11 - HIRFunction,
12 - Instruction,
13 - InstructionId,
14 - InstructionValue,
15 -} from "./HIR";
16 -import { BlockTerminal, Visitor, visitTree } from "./HIRTreeVisitor";
17 -import { printLValue, printMixedHIR } from "./PrintHIR";
18 -
19 -/**
20 - * Returns a text description of the HIR that has the overall tree shape
21 - * of the original AST, but with the contents of each block printed
22 - * similarly to printHIR's instruction formatting.
23 - */
24 -export function printHIRTree(fn: HIRFunction): string {
25 - return visitTree(fn, new PrintVisitor());
26 -}
27 -
28 -class PrintVisitor
29 - implements
30 - Visitor<
31 - Array<string>,
32 - string,
33 - Array<string>,
34 - Array<string>,
35 - string,
36 - string,
37 - string
38 - >
39 -{
40 - depth: number = 0; // for indentation
41 -
42 - enterBlock(): string[] {
43 - this.depth++;
44 - return [];
45 - }
46 - enterValueBlock(): string[] {
47 - return this.enterBlock();
48 - }
49 - leaveValueBlock(block: string[], value: string): string {
50 - return this.leaveBlock(block);
51 - }
52 - enterInitBlock(block: string[]): string[] {
53 - return this.enterBlock();
54 - }
55 - leaveInitBlock(block: string[]): string[] {
56 - return block;
57 - }
58 - visitValue(value: InstructionValue): string {
59 - return printMixedHIR(value);
60 - }
61 - visitInstruction(instr: Instruction, value: string): string {
62 - if (instr.lvalue !== null) {
63 - return `[${instr.id}] ${printLValue(instr.lvalue)} = ${value}`;
64 - } else {
65 - return `[${instr.id}] ${value}`;
66 - }
67 - }
68 - visitTerminalId(id: InstructionId): void {}
69 - visitImplicitTerminal(): string | null {
70 - return null;
71 - }
72 - visitTerminal(
73 - terminal: BlockTerminal<string[], string, string, string>
74 - ): string {
75 - let value: string;
76 - switch (terminal.kind) {
77 - case "break": {
78 - if (terminal.label !== null) {
79 - value = `Break ${terminal.label}`;
80 - } else {
81 - value = "Break";
82 - }
83 - break;
84 - }
85 - case "continue": {
86 - if (terminal.label !== null) {
87 - value = `Continue ${terminal.label}`;
88 - } else {
89 - value = "Continue";
90 - }
91 - break;
92 - }
93 - case "if": {
94 - if (terminal.alternate !== null) {
95 - value = `If (${
96 - terminal.test
97 - }) ${terminal.consequent.trimStart()} else ${terminal.alternate}`;
98 - } else {
99 - value = `If (${terminal.test}) ${terminal.consequent.trimStart()}`;
100 - }
101 - break;
102 - }
103 - case "switch": {
104 - const prefix = " ".repeat(this.depth);
105 - value = `Switch (${terminal.test}) {\n${terminal.cases
106 - .flatMap((case_) => case_.split("\n").map((line) => ` ${line}`))
107 - .join("\n")}\n${prefix}}`;
108 - break;
109 - }
110 - case "while": {
111 - value = `While (${terminal.test}) ${terminal.loop.trimStart()}`;
112 - break;
113 - }
114 - case "for": {
115 - value = `For (TODO) (${
116 - terminal.test
117 - }) (TODO) ${terminal.loop.trimStart()}`;
118 - break;
119 - }
120 - case "return": {
121 - if (terminal.value !== null) {
122 - value = `Return ${terminal.value}`;
123 - } else {
124 - value = "Return";
125 - }
126 - break;
127 - }
128 - case "throw": {
129 - value = `Throw ${terminal.value}`;
130 - break;
131 - }
132 - default: {
133 - assertExhaustive(
134 - terminal,
135 - `Unexpected terminal kind '${(terminal as any).kind}'`
136 - );
137 - }
138 - }
139 - return value;
140 - }
141 - visitCase(test: string | null, block: string): string {
142 - const prefix = " ".repeat(this.depth);
143 - if (test === null) {
144 - return `${prefix}default: ${block.trimStart()}`;
145 - } else {
146 - return `${prefix}case ${test}: ${block.trimStart()}`;
147 - }
148 - }
149 - appendBlock(
150 - block: string[],
151 - item: string,
152 - label?: BlockId | undefined
153 - ): void {
154 - const prefix = " ".repeat(this.depth);
155 - if (item !== "") {
156 - block.push(`${prefix}${item.trimStart()}`);
157 - }
158 - if (label !== undefined) {
159 - block.push(`${prefix}bb${label}:`);
160 - }
161 - }
162 - appendValueBlock(block: string[], item: string): void {
163 - this.appendBlock(block, item);
164 - }
165 - appendInitBlock(block: string[], item: string): void {
166 - this.appendBlock(block, item);
167 - }
168 - leaveBlock(block: string[]): string {
169 - this.depth--;
170 - const prefix = " ".repeat(this.depth);
171 - return `${prefix}{\n${block.join("\n")}\n${prefix}}`;
172 - }
173 -}
compiler/forget/src/HIR/visitors.ts
+1 -1
@@ -5,7 +5,7 @@
5 * LICENSE file in the root directory of this source tree.
6 */
7
8 -import { assertExhaustive } from "../Common/utils";
8 +import { assertExhaustive } from "../Utils/utils";
9 import {
10 BasicBlock,
11 BlockId,
compiler/forget/src/ReactiveScopes/BuildReactiveFunction.ts renamed
+4 -4
@@ -6,7 +6,6 @@
6 */
7
8 import invariant from "invariant";
9 -import { assertExhaustive } from "../Common/utils";
9 import {
10 BlockId,
11 HIRFunction,
@@ -22,9 +21,10 @@ import {
21 ReactiveTerminal,
22 ReactiveValueBlock,
23 ScopeId,
25 -} from "./HIR";
26 -import { BlockTerminal, Visitor, visitTree } from "./HIRTreeVisitor";
27 -import { eachInstructionOperand } from "./visitors";
24 +} from "../HIR/HIR";
25 +import { BlockTerminal, Visitor, visitTree } from "../HIR/HIRTreeVisitor";
26 +import { eachInstructionOperand } from "../HIR/visitors";
27 +import { assertExhaustive } from "../Utils/utils";
28
29 export function buildReactiveFunction(fn: HIRFunction): ReactiveFunction {
30 const builder = new ReactiveFunctionBuilder();
compiler/forget/src/ReactiveScopes/CodegenReactiveFunction.ts renamed
+4 -4
@@ -7,7 +7,6 @@
7
8 import * as t from "@babel/types";
9 import invariant from "invariant";
10 -import { assertExhaustive } from "../Common/utils";
10 import {
11 codegenInstruction,
12 codegenInstructionValue,
@@ -16,7 +15,7 @@ import {
15 convertIdentifier,
16 createFunctionDeclaration,
17 Temporaries,
19 -} from "./Codegen";
18 +} from "../HIR/Codegen";
19 import {
20 Identifier,
21 Instruction,
@@ -26,8 +25,9 @@ import {
25 ReactiveScope,
26 ReactiveTerminal,
27 ReactiveValueBlock,
29 -} from "./HIR";
30 -import { todoInvariant } from "./todo";
28 +} from "../HIR/HIR";
29 +import { todoInvariant } from "../Utils/todo";
30 +import { assertExhaustive } from "../Utils/utils";
31
32 export function codegenReactiveFunction(fn: ReactiveFunction): t.Function {
33 const cx = new Context();
compiler/forget/src/ReactiveScopes/FlattenReactiveLoops.ts renamed
+6 -2
@@ -5,8 +5,12 @@
5 * LICENSE file in the root directory of this source tree.
6 */
7
8 -import { assertExhaustive } from "../Common/utils";
9 -import { ReactiveBlock, ReactiveFunction, ReactiveScopeBlock } from "./HIR";
8 +import {
9 + ReactiveBlock,
10 + ReactiveFunction,
11 + ReactiveScopeBlock,
12 +} from "../HIR/HIR";
13 +import { assertExhaustive } from "../Utils/utils";
14
15 /**
16 * Given a reactive function, flattens any scopes contained within a loop construct.
compiler/forget/src/ReactiveScopes/InferReactiveScopeVariables.ts renamed
+4 -4
@@ -6,8 +6,6 @@
6 */
7
8 import invariant from "invariant";
9 -import { assertExhaustive } from "../Common/utils";
10 -import DisjointSet from "./DisjointSet";
9 import {
10 HIRFunction,
11 Identifier,
@@ -18,8 +16,10 @@ import {
16 Place,
17 ReactiveScope,
18 ScopeId,
21 -} from "./HIR";
22 -import { eachInstructionOperand } from "./visitors";
19 +} from "../HIR/HIR";
20 +import { eachInstructionOperand } from "../HIR/visitors";
21 +import DisjointSet from "../Utils/DisjointSet";
22 +import { assertExhaustive } from "../Utils/utils";
23
24 /**
25 * For each mutable variable, infers a reactive scope which will construct that
compiler/forget/src/ReactiveScopes/InferReactiveScopes.ts renamed
+7 -7
@@ -6,8 +6,6 @@
6 */
7
8 import invariant from "invariant";
9 -import { retainWhere } from "../Common/utils";
10 -import DisjointSet from "./DisjointSet";
9 import {
10 BlockId,
11 HIRFunction,
@@ -18,14 +16,16 @@ import {
16 MutableRange,
17 ReactiveScope,
18 ScopeId,
21 -} from "./HIR";
22 -import { BlockTerminal, Visitor, visitTree } from "./HIRTreeVisitor";
23 -import { log } from "./logger";
24 -import { printFunction } from "./PrintHIR";
19 +} from "../HIR/HIR";
20 +import { BlockTerminal, Visitor, visitTree } from "../HIR/HIRTreeVisitor";
21 +import { printFunction } from "../HIR/PrintHIR";
22 import {
23 eachInstructionOperand,
24 eachInstructionValueOperand,
28 -} from "./visitors";
25 +} from "../HIR/visitors";
26 +import DisjointSet from "../Utils/DisjointSet";
27 +import { log } from "../Utils/logger";
28 +import { retainWhere } from "../Utils/utils";
29
30 /**
31 * This is a second (final) stage of constructing reactive scopes. Prior to this pass,
compiler/forget/src/ReactiveScopes/PrintReactiveFunction.ts renamed
+3 -3
@@ -6,20 +6,20 @@
6 */
7
8 import invariant from "invariant";
9 -import { assertExhaustive } from "../Common/utils";
9 import {
10 ReactiveFunction,
11 ReactiveScopeBlock,
12 ReactiveStatement,
13 ReactiveTerminal,
14 ReactiveValueBlock,
16 -} from "./HIR";
15 +} from "../HIR/HIR";
16 import {
17 printIdentifier,
18 printInstruction,
19 printInstructionValue,
20 printPlace,
22 -} from "./PrintHIR";
21 +} from "../HIR/PrintHIR";
22 +import { assertExhaustive } from "../Utils/utils";
23
24 export function printReactiveFunction(fn: ReactiveFunction): string {
25 const writer = new Writer();
compiler/forget/src/ReactiveScopes/PropagateScopeDependencies.ts renamed
+3 -3
@@ -5,7 +5,6 @@
5 * LICENSE file in the root directory of this source tree.
6 */
7
8 -import { assertExhaustive } from "../Common/utils";
8 import {
9 Identifier,
10 Instruction,
@@ -18,8 +17,9 @@ import {
17 ReactiveBlock,
18 ReactiveFunction,
19 ReactiveValueBlock,
21 -} from "./HIR";
22 -import { eachInstructionValueOperand } from "./visitors";
20 +} from "../HIR/HIR";
21 +import { eachInstructionValueOperand } from "../HIR/visitors";
22 +import { assertExhaustive } from "../Utils/utils";
23
24 /**
25 * Infers the dependencies of each scope to include variables whose values
compiler/forget/src/ReactiveScopes/PruneUnusedLabels.ts renamed
+2 -2
@@ -5,13 +5,13 @@
5 * LICENSE file in the root directory of this source tree.
6 */
7
8 -import { assertExhaustive } from "../Common/utils";
8 import {
9 BlockId,
10 ReactiveBlock,
11 ReactiveFunction,
12 ReactiveTerminal,
14 -} from "./HIR";
13 +} from "../HIR/HIR";
14 +import { assertExhaustive } from "../Utils/utils";
15
16 /**
17 * Prunes terminal labels that are never explicitly jumped to.
compiler/forget/src/SSA/EliminateRedundantPhi.ts renamed
+2 -2
@@ -6,8 +6,8 @@
6 */
7
8 import invariant from "invariant";
9 -import { BlockId, HIRFunction, Identifier, Place } from "./HIR";
10 -import { eachInstructionOperand, eachTerminalOperand } from "./visitors";
9 +import { BlockId, HIRFunction, Identifier, Place } from "../HIR/HIR";
10 +import { eachInstructionOperand, eachTerminalOperand } from "../HIR/visitors";
11
12 /**
13 * Pass to eliminate redundant phi nodes:
compiler/forget/src/SSA/EnterSSA.ts renamed
+5 -5
@@ -1,4 +1,3 @@
1 -import { invariant } from "../CompilerError";
1 import {
2 BasicBlock,
3 HIRFunction,
@@ -8,14 +7,15 @@ import {
7 makeType,
8 Phi,
9 Place,
11 -} from "./HIR";
12 -import { Environment } from "./HIRBuilder";
13 -import { printIdentifier } from "./PrintHIR";
10 +} from "../HIR/HIR";
11 +import { Environment } from "../HIR/HIRBuilder";
12 +import { printIdentifier } from "../HIR/PrintHIR";
13 import {
14 eachTerminalSuccessor,
15 mapInstructionOperands,
16 mapTerminalOperands,
18 -} from "./visitors";
17 +} from "../HIR/visitors";
18 +import { invariant } from "../Utils/CompilerError";
19
20 type IncompletePhi = {
21 oldId: Identifier;
compiler/forget/src/SSA/LeaveSSA.ts renamed
+5 -2
@@ -17,8 +17,11 @@ import {
17 makeInstructionId,
18 Phi,
19 Place,
20 -} from "./HIR";
21 -import { eachInstructionValueOperand, eachTerminalOperand } from "./visitors";
20 +} from "../HIR/HIR";
21 +import {
22 + eachInstructionValueOperand,
23 + eachTerminalOperand,
24 +} from "../HIR/visitors";
25
26 /**
27 * Removes SSA form by creating unique variable declarations for the versions of each variables.
compiler/forget/src/Utils/CompilerError.ts renamed
compiler/forget/src/Utils/DisjointSet.ts renamed
+1 -1
@@ -5,7 +5,7 @@
5 * LICENSE file in the root directory of this source tree.
6 */
7
8 -import { invariant } from "../CompilerError";
8 +import { invariant } from "./CompilerError";
9
10 /**
11 * Represents items which form disjoint sets.
compiler/forget/src/Utils/VisualizeHIRMermaid.ts renamed
+3 -3
@@ -1,6 +1,6 @@
1 -import { assertExhaustive } from "../Common/utils";
2 -import { BasicBlock, BlockId, HIRFunction, Terminal } from "./HIR";
3 -import { printInstruction, printPlace } from "./PrintHIR";
1 +import { BasicBlock, BlockId, HIRFunction, Terminal } from "../HIR/HIR";
2 +import { printInstruction, printPlace } from "../HIR/PrintHIR";
3 +import { assertExhaustive } from "./utils";
4
5 const INSTRUCTIONS_NODE_NAME = "instrs";
6 const TERMINAL_NODE_NAME = "terminal";
compiler/forget/src/Utils/logger.ts renamed
+2 -2
@@ -5,8 +5,8 @@
5 * LICENSE file in the root directory of this source tree.
6 */
7
8 -import { HIR, HIRFunction } from "./HIR";
9 -import printHIR, { printFunction } from "./PrintHIR";
8 +import { HIR, HIRFunction } from "../HIR/HIR";
9 +import printHIR, { printFunction } from "../HIR/PrintHIR";
10
11 let ENABLED: boolean = false;
12
compiler/forget/src/Utils/todo.ts renamed
compiler/forget/src/Utils/utils.ts renamed
-37
@@ -5,43 +5,6 @@
5 * LICENSE file in the root directory of this source tree.
6 */
7
8 -/**
9 - * Individual util functions.
10 - */
11 -
12 -export function setEq<T>(a: Set<T>, b: Set<T>): boolean {
13 - return a.size === b.size && [...a].every((v) => b.has(v));
14 -}
15 -
16 -export function nullableSetEq<T>(
17 - a: Set<T> | undefined,
18 - b: Set<T> | undefined
19 -): boolean {
20 - if (a === undefined && b === undefined) return true;
21 - if (a === undefined || b === undefined) return false;
22 - return a.size === b.size && [...a].every((v) => b.has(v));
23 -}
24 -
25 -export function setSubset<T>(a: Set<T>, b: Set<T>): boolean {
26 - return a.size <= b.size && [...a].every((v) => b.has(v));
27 -}
28 -
29 -export function setIntersect<T>(a: Set<T>, b: Set<T>): boolean {
30 - return [...a].some((v) => b.has(v));
31 -}
32 -
33 -export function setFirst<T>(s: Set<T>): T {
34 - return [...s][0];
35 -}
36 -
37 -export function setEmpty<T>(s: Set<T>): boolean {
38 - return s.size === 0;
39 -}
40 -
41 -export function hasOwnProperty<T>(obj: T, key: PropertyKey): key is keyof T {
42 - return Object.prototype.hasOwnProperty.call(obj, key);
43 -}
44 -
8 /**
9 * Trigger an exhaustivess check in TypeScript and throw at runtime.
10 *
compiler/forget/src/__tests__/hir-test.ts
+1 -1
@@ -14,9 +14,9 @@ import { wasmFolder } from "@hpcc-js/wasm";
14 import invariant from "invariant";
15 import path from "path";
16 import prettier from "prettier";
17 -import { toggleLogging } from "../HIR/logger";
17 import run from "../HIR/Pipeline";
18 import { printFunction } from "../HIR/PrintHIR";
19 +import { toggleLogging } from "../Utils/logger";
20 import generateTestsFromFixtures from "./test-utils/generateTestsFromFixtures";
21
22 function wrapWithTripleBackticks(s: string, ext?: string) {
compiler/forget/src/index.ts
+12 -12
@@ -5,7 +5,7 @@
5 * LICENSE file in the root directory of this source tree.
6 */
7
8 -import BabelPlugin from "./BabelPlugin";
8 +import BabelPlugin from "./Babel/BabelPlugin";
9
10 declare global {
11 var __DEV__: boolean | null | undefined;
@@ -15,22 +15,22 @@ import { parse } from "@babel/parser";
15 import traverse, { NodePath } from "@babel/traverse";
16 import * as t from "@babel/types";
17 import { lower } from "./HIR/BuildHIR";
18 -import { buildReactiveFunction } from "./HIR/BuildReactiveFunction";
18 import codegen from "./HIR/Codegen";
20 -import { codegenReactiveFunction } from "./HIR/CodegenReactiveFunction";
21 -import { eliminateRedundantPhi } from "./HIR/EliminateRedundantPhi";
22 -import enterSSA from "./HIR/EnterSSA";
23 -import { flattenReactiveLoops } from "./HIR/FlattenReactiveLoops";
19 import { Environment } from "./HIR/HIRBuilder";
20 import { inferMutableRanges } from "./HIR/InferMutableRanges";
26 -import { inferReactiveScopes } from "./HIR/InferReactiveScopes";
27 -import { inferReactiveScopeVariables } from "./HIR/InferReactiveScopeVariables";
21 import inferReferenceEffects from "./HIR/InferReferenceEffects";
29 -import { leaveSSA } from "./HIR/LeaveSSA";
22 import printHIR, { printFunction } from "./HIR/PrintHIR";
31 -import { printReactiveFunction } from "./HIR/PrintReactiveFunction";
32 -import { propagateScopeDependencies } from "./HIR/PropagateScopeDependencies";
33 -import { pruneUnusedLabels } from "./HIR/PruneUnusedLabels";
23 +import { buildReactiveFunction } from "./ReactiveScopes/BuildReactiveFunction";
24 +import { codegenReactiveFunction } from "./ReactiveScopes/CodegenReactiveFunction";
25 +import { flattenReactiveLoops } from "./ReactiveScopes/FlattenReactiveLoops";
26 +import { inferReactiveScopes } from "./ReactiveScopes/InferReactiveScopes";
27 +import { inferReactiveScopeVariables } from "./ReactiveScopes/InferReactiveScopeVariables";
28 +import { printReactiveFunction } from "./ReactiveScopes/PrintReactiveFunction";
29 +import { propagateScopeDependencies } from "./ReactiveScopes/PropagateScopeDependencies";
30 +import { pruneUnusedLabels } from "./ReactiveScopes/PruneUnusedLabels";
31 +import { eliminateRedundantPhi } from "./SSA/EliminateRedundantPhi";
32 +import enterSSA from "./SSA/EnterSSA";
33 +import { leaveSSA } from "./SSA/LeaveSSA";
34
35 function parseFunctions(
36 source: string