From 4b9c2f36feb7b6ae8fd5a294e03c244d8397e839 Mon Sep 17 00:00:00 2001
From: Joseph Savona <josephsavona@users.noreply.github.com>
Date: Thu, 1 Dec 2022 11:02:27 -0800
Subject: [PATCH] add missing reactive scope passes to playground

I forget to add these passes to the playground, oops.
---
 .../playground/components/Editor/Output.tsx   | 22 +++++++++++
 .../playground/components/TabbedWindow.tsx    |  2 +
 compiler/forget/src/index.ts                  |  4 ++
 compiler/forget/yarn.lock                     | 38 +++++++++----------
 4 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/compiler/forget/packages/playground/components/Editor/Output.tsx b/compiler/forget/packages/playground/components/Editor/Output.tsx
index c8bc2e94b1..42d7b622b6 100644
--- a/compiler/forget/packages/playground/components/Editor/Output.tsx
+++ b/compiler/forget/packages/playground/components/Editor/Output.tsx
@@ -27,6 +27,8 @@ const {
   inferReferenceEffects,
   inferMutableRanges,
   inferReactiveScopeDependencies,
+  inferReactiveScopeVariables,
+  inferReactiveScopes,
   leaveSSA,
   lower,
   printHIR,
@@ -49,6 +51,8 @@ type CompilerOutput = {
   eliminateRedundantPhiOutput: string;
   inferReferenceEffectsOutput: string;
   inferMutableRangesOutput: string;
+  inferReactiveScopeVariablesOutput: string;
+  inferReactiveScopesOutput: string;
   inferReactiveScopeDependenciesOutput: string;
   leaveSSAOutput: string;
   codegenOutput: string;
@@ -83,6 +87,12 @@ function compile(source: string): CompilerOutput | CompilerError {
     inferMutableRanges(ir);
     const inferMutableRangesOutput = printHIR(ir.body);
 
+    inferReactiveScopeVariables(ir);
+    const inferReactiveScopeVariablesOutput = printHIR(ir.body);
+
+    inferReactiveScopes(ir);
+    const inferReactiveScopesOutput = printHIR(ir.body);
+
     inferReactiveScopeDependencies(ir);
     const inferReactiveScopeDependenciesOutput = printHIR(ir.body);
 
@@ -116,6 +126,8 @@ function compile(source: string): CompilerOutput | CompilerError {
       inferReferenceEffectsOutput,
       inferMutableRangesOutput,
       inferReactiveScopeDependenciesOutput,
+      inferReactiveScopeVariablesOutput,
+      inferReactiveScopesOutput,
       leaveSSAOutput,
       codegenOutput,
       sourceMapUrl,
@@ -171,6 +183,16 @@ function Output({ store, setTabsOpen, tabsOpen }: Props) {
             output={compilerOutput.inferMutableRangesOutput}
           ></TextTabContent>
         ),
+        InferReactiveScopeVariables: (
+          <TextTabContent
+            output={compilerOutput.inferReactiveScopeVariablesOutput}
+          ></TextTabContent>
+        ),
+        InferReactiveScopes: (
+          <TextTabContent
+            output={compilerOutput.inferReactiveScopesOutput}
+          ></TextTabContent>
+        ),
         InferReactiveScopeDependencies: (
           <TextTabContent
             output={compilerOutput.inferReactiveScopeDependenciesOutput}
diff --git a/compiler/forget/packages/playground/components/TabbedWindow.tsx b/compiler/forget/packages/playground/components/TabbedWindow.tsx
index 35b784c2bd..116e3548fc 100644
--- a/compiler/forget/packages/playground/components/TabbedWindow.tsx
+++ b/compiler/forget/packages/playground/components/TabbedWindow.tsx
@@ -13,6 +13,8 @@ export type TabTypes =
   | "EliminateRedundantPhi"
   | "InferReferenceEffects"
   | "InferMutableRanges"
+  | "InferReactiveScopeVariables"
+  | "InferReactiveScopes"
   | "InferReactiveScopeDependencies"
   | "LeaveSSA"
   | "JS"
diff --git a/compiler/forget/src/index.ts b/compiler/forget/src/index.ts
index de6e443aaa..f143316c21 100644
--- a/compiler/forget/src/index.ts
+++ b/compiler/forget/src/index.ts
@@ -31,6 +31,8 @@ import enterSSA from "./HIR/EnterSSA";
 import { Environment } from "./HIR/HIRBuilder";
 import { inferMutableRanges } from "./HIR/InferMutableLifetimes";
 import { inferReactiveScopeDependencies } from "./HIR/InferReactiveScopeDependencies";
+import { inferReactiveScopes } from "./HIR/InferReactiveScopes";
+import { inferReactiveScopeVariables } from "./HIR/InferReactiveScopeVariables";
 import inferReferenceEffects from "./HIR/InferReferenceEffects";
 import leaveSSA from "./HIR/LeaveSSA";
 import printHIR from "./HIR/PrintHIR";
@@ -64,6 +66,8 @@ export const HIR = {
   inferMutableRanges,
   inferReferenceEffects,
   inferReactiveScopeDependencies,
+  inferReactiveScopeVariables,
+  inferReactiveScopes,
   printHIR,
   Environment,
   leaveSSA,
diff --git a/compiler/forget/yarn.lock b/compiler/forget/yarn.lock
index dc59b50076..84bcf2e1ec 100644
--- a/compiler/forget/yarn.lock
+++ b/compiler/forget/yarn.lock
@@ -83,12 +83,12 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.20.1":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.2.tgz#c2e89e22613a039285c1e7b749e2cd0b30b9a481"
-  integrity sha512-SD75PMIK6i9H8G/tfGvB4KKl4Nw6Ssos9nGgYwxbgyTP0iX/Z55DveoH86rmUB/YHTQQ+ZC0F7xxaY8l2OF44Q==
+"@babel/generator@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95"
+  integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==
   dependencies:
-    "@babel/types" "^7.20.2"
+    "@babel/types" "^7.20.5"
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
@@ -260,10 +260,10 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.3.tgz#8dd36d17c53ff347f9e55c328710321b49479a9a"
   integrity sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ==
 
-"@babel/parser@^7.20.1":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.2.tgz#9aeb9b92f64412b5f81064d46f6a1ac0881337f4"
-  integrity sha512-afk318kh2uKbo7BEj2QtEi8HVCGrwHUffrYDy7dgVcSa2j9lY3LDjPzcyGdpX7xgm35aWqvciZJ4WKmdF/SxYg==
+"@babel/parser@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8"
+  integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -484,18 +484,18 @@
     lodash "^4.17.10"
 
 "@babel/traverse@^7.19.1":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.1.tgz#9b15ccbf882f6d107eeeecf263fbcdd208777ec8"
-  integrity sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133"
+  integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==
   dependencies:
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.1"
+    "@babel/generator" "^7.20.5"
     "@babel/helper-environment-visitor" "^7.18.9"
     "@babel/helper-function-name" "^7.19.0"
     "@babel/helper-hoist-variables" "^7.18.6"
     "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.20.1"
-    "@babel/types" "^7.20.0"
+    "@babel/parser" "^7.20.5"
+    "@babel/types" "^7.20.5"
     debug "^4.1.0"
     globals "^11.1.0"
 
@@ -534,10 +534,10 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.20.0", "@babel/types@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842"
-  integrity sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==
+"@babel/types@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84"
+  integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==
   dependencies:
     "@babel/helper-string-parser" "^7.19.4"
     "@babel/helper-validator-identifier" "^7.19.1"