Refactor

Author: NeilKleistGao

hkmc2/shared/src/main/scala/hkmc2/codegen/Lowering.scala

@@ -626,23 +626,19 @@ class Lowering()(using Config, TL, Raise, State, Ctx):
   def quoteSplit(split: Split)(k: Result => Block)(using Subst): Block = split match
     case Split.Cons(Branch(scrutinee, pattern, continuation), tail) => quote(scrutinee): r1 =>
       val l1, l2, l3, l4, l5 = new TempSymbol(N)
-      Assign(l1, r1, quotePattern(pattern): r2 =>
-        Assign(l2, r2, quoteSplit(continuation): r3 =>
-          Assign(l3, r3, setupTerm("Branch", (l1 :: l2 :: l3 :: Nil).map(s => Value.Ref(s))): r4 =>
-            Assign(l4, r4, quoteSplit(tail): r5 =>
-              Assign(l5, r5, setupTerm("Cons", (l4 :: l5 :: Nil).map(s => Value.Ref(s)))(k))
-            )
-          )
-        )
-      )
+      blockBuilder.assign(l1, r1)
+        .chain(b => quotePattern(pattern)(r2 => Assign(l2, r2, b)))
+        .chain(b => quoteSplit(continuation)(r3 => Assign(l3, r3, b)))
+        .chain(b => setupTerm("Branch", (l1 :: l2 :: l3 :: Nil).map(s => Value.Ref(s)))(r4 => Assign(l4, r4, b)))
+        .chain(b => quoteSplit(tail)(r5 => Assign(l5, r5, b)))
+        .rest(setupTerm("Cons", (l4 :: l5 :: Nil).map(s => Value.Ref(s)))(k))
     case Split.Let(sym, term, tail) => setupSymbol(sym, true): r1 =>
       val l1, l2, l3 = new TempSymbol(N)
-      Assign(l1, r1, setupTerm("Ref", Value.Ref(l1) :: Nil): r =>
-        Assign(sym, r, quote(term)(r2 =>
-        Assign(l2, r2, quoteSplit(tail)(r3 =>
-          Assign(l3, r3, setupTerm("Let", (l1 :: l2 :: l3 :: Nil).map(s => Value.Ref(s)))(k))
-        )))
-      ))
+      blockBuilder.assign(l1, r1)
+        .chain(b => setupTerm("Ref", Value.Ref(l1) :: Nil)(r => Assign(sym, r, b)))
+        .chain(b => quote(term)(r2 => Assign(l2, r2, b)))
+        .chain(b => quoteSplit(tail)(r3 => Assign(l3, r3, b)))
+        .rest(setupTerm("Let", (l1 :: l2 :: l3 :: Nil).map(s => Value.Ref(s)))(k))
     case Split.Else(default) => quote(default): r =>
       val l = new TempSymbol(N)
       Assign(l, r, setupTerm("Else", Value.Ref(l) :: Nil)(k))
@@ -705,18 +701,16 @@ class Lowering()(using Config, TL, Raise, State, Ctx):
       rec(rhs, Nil)(k)
     case Blk(LetDecl(sym, _) :: DefineVar(sym2, rhs) :: Nil, res) => // Let bindings
       require(sym2 is sym)
-      setupSymbol(sym, true): r1 =>
+      setupSymbol(sym, true){r1 =>
         val l1, l2, l3, l4, l5 = new TempSymbol(N)
-        Assign(l1, r1, setupTerm("Ref", Value.Ref(l1) :: Nil): r =>
-          Assign(sym, r, quote(rhs)(r2 =>
-            Assign(l2, r2, quote(res)(r3 =>
-              Assign(l3, r3, setupTerm("LetDecl", Value.Ref(l1) :: Nil)(r4 =>
-                Assign(l4, r4, setupTerm("DefineVar", Value.Ref(l1) :: Value.Ref(l2) :: Nil)(r5 =>
-                  Assign(l5, r5, setupTerm("Blk", Value.Arr((l4 :: l5 :: Nil).map(s => Value.Ref(s).asArg)) :: Value.Ref(l3) :: Nil)(k))
-                ))
-              ))
-            ))
-          )))
+        blockBuilder.assign(l1, r1)
+          .chain(b => setupTerm("Ref", Value.Ref(l1) :: Nil)(r => Assign(sym, r, b)))
+          .chain(b => quote(rhs)(r2 => Assign(l2, r2, b)))
+          .chain(b => quote(res)(r3 => Assign(l3, r3, b)))
+          .chain(b => setupTerm("LetDecl", Value.Ref(l1) :: Nil)(r4 => Assign(l4, r4, b)))
+          .chain(b => setupTerm("DefineVar", Value.Ref(l1) :: Value.Ref(l2) :: Nil)(r5 => Assign(l5, r5, b)))
+          .rest(setupTerm("Blk", Value.Arr((l4 :: l5 :: Nil).map(s => Value.Ref(s).asArg)) :: Value.Ref(l3) :: Nil)(k))
+      }
     case IfLike(syntax.Keyword.`if`, split) => quoteSplit(split): r =>
       val l = new TempSymbol(N)
       Assign(l, r, setupTerm("IfLike", setupQuotedKeyword("If") :: Value.Ref(l) :: Nil)(k))

hkmc2/shared/src/test/mlscript-compile/QuoteExample.mjs

@@ -128,36 +128,36 @@ let QuoteExample1;
     tmp6 = Term.freshName("scrut");
     tmp7 = new Term.Symbol(tmp6);
     scrut = new Term.Ref(tmp7);
-    tmp10 = y1;
-    tmp11 = new Term.Lit(0.0);
-    tmp12 = new Term.Builtin("==");
-    tmp13 = new Term.Tup([
-      tmp10,
-      tmp11
+    tmp23 = y1;
+    tmp24 = new Term.Lit(0.0);
+    tmp25 = new Term.Builtin("==");
+    tmp26 = new Term.Tup([
+      tmp23,
+      tmp24
     ]);
-    tmp8 = new Term.App(tmp12, tmp13);
-    tmp14 = scrut;
-    tmp15 = new Term.LitPattern(true);
-    tmp19 = d;
-    tmp16 = new Term.Else(tmp19);
-    tmp17 = new Term.Branch(tmp14, tmp15, tmp16);
-    tmp20 = x2;
-    tmp21 = y1;
-    tmp22 = new Term.Builtin("/");
-    tmp23 = new Term.Tup([
-      tmp20,
-      tmp21
+    tmp8 = new Term.App(tmp25, tmp26);
+    tmp12 = scrut;
+    tmp13 = new Term.LitPattern(true);
+    tmp22 = d;
+    tmp14 = new Term.Else(tmp22);
+    tmp15 = new Term.Branch(tmp12, tmp13, tmp14);
+    tmp17 = x2;
+    tmp18 = y1;
+    tmp19 = new Term.Builtin("/");
+    tmp20 = new Term.Tup([
+      tmp17,
+      tmp18
     ]);
-    tmp24 = new Term.App(tmp22, tmp23);
-    tmp18 = new Term.Else(tmp24);
-    tmp9 = new Term.Cons(tmp17, tmp18);
-    tmp25 = new Term.Let(tmp7, tmp8, tmp9);
-    tmp26 = new Term.IfLike(Term.Keyword.If, tmp25);
+    tmp21 = new Term.App(tmp19, tmp20);
+    tmp16 = new Term.Else(tmp21);
+    tmp9 = new Term.Cons(tmp15, tmp16);
+    tmp10 = new Term.Let(tmp7, tmp8, tmp9);
+    tmp11 = new Term.IfLike(Term.Keyword.If, tmp10);
     return new Term.Lam([
       tmp1,
       tmp3,
       tmp5
-    ], tmp26)
+    ], tmp11)
   }
   static toString() { return "QuoteExample"; }
 });

hkmc2/shared/src/test/mlscript/codegen/Quasiquotes.mls

@@ -74,16 +74,16 @@ f`(`0)
 //│ tmp36 = new Term.Symbol(tmp35);
 //│ scrut = new Term.Ref(tmp36);
 //│ tmp37 = new Term.Lit(true);
-//│ tmp39 = scrut;
-//│ tmp40 = new Term.LitPattern(true);
-//│ tmp44 = new Term.Lit(true);
-//│ tmp41 = new Term.Else(tmp44);
-//│ tmp42 = new Term.Branch(tmp39, tmp40, tmp41);
+//│ tmp40 = scrut;
+//│ tmp41 = new Term.LitPattern(true);
+//│ tmp46 = new Term.Lit(true);
+//│ tmp42 = new Term.Else(tmp46);
+//│ tmp43 = new Term.Branch(tmp40, tmp41, tmp42);
 //│ tmp45 = new Term.Lit(false);
-//│ tmp43 = new Term.Else(tmp45);
-//│ tmp38 = new Term.Cons(tmp42, tmp43);
-//│ tmp46 = new Term.Let(tmp36, tmp37, tmp38);
-//│ new Term.IfLike(Term.Keyword.If, tmp46)
+//│ tmp44 = new Term.Else(tmp45);
+//│ tmp38 = new Term.Cons(tmp43, tmp44);
+//│ tmp39 = new Term.Let(tmp36, tmp37, tmp38);
+//│ new Term.IfLike(Term.Keyword.If, tmp39)
 //│ = IfLike(If, Let(Symbol("scrut_0"), Lit(true), Cons(Branch(Ref(Symbol("scrut_0")), LitPattern(true), Else(Lit(true))), Else(Lit(false)))))