Merge branch 'instrument-with-pretty-print' into instrument

Author: yeungsinchun

hkmc2/shared/src/test/mlscript-compile/Block.mls

@@ -79,27 +79,28 @@ fun showPath(p) =
     DynSelect(qual, fld, idx) then showPath(qual) + "[" + showPath(fld) + "]"
     ValueRef(s) then showSymbol(s)
     ValueLit(l) then showLiteral(l)
-    _ then "<unknown>"
+    _ then "<unknown path>"
 
 fun showArg(a) =
   (if a.spread is Some(true) then "..." else "") + showPath(a.value)
 
 fun showArgs(args) =
-  args.map(showArg)
+  args.map(showArg).join(",")
 
 fun showResult(r) =
   if r is
     Call(f, args) then showPath(f) + "(" + showArgs(args) + ")"
     Instantiate(cls, args) then "new " + showPath(cls) + "(" + showArgs(args) + ")"
     Tuple(elems) then "[" + showArgs(elems) + "]"
     Path then showPath(r)
+    _ then "<unknown result>"
 
 fun showCase(c) =
   if c is
     Lit(l) then showLiteral(l)
-    Cls(cls, p) then showSymbol(cls) + "(" + showPath(p) + ")"
+    Cls(cls, p) then showSymbol(cls)
     Tup(len) then "Tuple"
-    _ then "_"
+    _ then "<unknown case>"
 
 fun showArm(a) =
   showCase(a.cse) + " then " + showBlock(a.body)
@@ -116,11 +117,13 @@ fun showDefn(d) =
   if d is
     ValDefn(sym, rhs) then
       "let " + showSymbol(sym) + " = " + showPath(rhs)
-    FunDefn(sym, params, body) then
-      "fun " + showSymbol(sym) + "(" + params.map(showSymbol) + ") =" +
+    FunDefn(sym, p, body) then
+      "fun " + showSymbol(sym) + showParams(p) + " =" +
       (if body is Return(_, _) then " " else "\n  ") + showBlock(body)
-    ClsLikeDefn(sym, paramsOpt) then
-      "class " + showSymbol(sym) + showParamsOpt(paramsOpt)
+    ClsLikeDefn(sym, _) then 
+      if sym is 
+        ClassSymbol(n, paramsOpt) then "class " + n + showParamsOpt(paramsOpt)
+    _ then "<unknown defn>"
 
 fun showBlock(b) =
   if b is
@@ -136,7 +139,7 @@ fun showBlock(b) =
       (if dflt is Some(db) then "\nelse " + showBlock(db) else "") +
       "\n" + showBlock(rest)
     End() then ""
-    x then x
+    _ then "<unknown block>"
 
 fun printCode(p: Block) =
   let s = showBlock(p) in

hkmc2/shared/src/test/mlscript/staging/Functions.mls

@@ -33,9 +33,8 @@
 //│ }
 //│ ShapeSet = class ShapeSet { ShapeSet: fun ShapeSet { class: class ShapeSet } }
 
-:slot
 :js
-staged module Expressions with
+staged module Expressions with 
   fun lit() = 1
   fun assign() = 
     let x = 42
@@ -54,29 +53,6 @@ staged module Expressions with
       Bool then 4
       // [1, 2] then 5 // TODO: Case.Tup, needs handling for Label, Break
       else 0
-//│ Pretty Lowered:
-//│  
-//│ define staged class Expressions in
-//│ set tmp = Expressions.lit_gen() in
-//│ set tmp1 = shapeSet.printShapeSet(tmp.(0)) in
-//│ set tmp2 = Block.printCode(tmp.(1)) in
-//│ set tmp3 = Expressions.assign_gen() in
-//│ set tmp4 = shapeSet.printShapeSet(tmp3.(0)) in
-//│ set tmp5 = Block.printCode(tmp3.(1)) in
-//│ set tmp6 = Expressions._var_gen() in
-//│ set tmp7 = shapeSet.printShapeSet(tmp6.(0)) in
-//│ set tmp8 = Block.printCode(tmp6.(1)) in
-//│ set tmp9 = Expressions.tup_gen() in
-//│ set tmp10 = shapeSet.printShapeSet(tmp9.(0)) in
-//│ set tmp11 = Block.printCode(tmp9.(1)) in
-//│ set tmp12 = Expressions.dynsel_gen() in
-//│ set tmp13 = shapeSet.printShapeSet(tmp12.(0)) in
-//│ set tmp14 = Block.printCode(tmp12.(1)) in
-//│ set tmp15 = Expressions.match_gen() in
-//│ set tmp16 = shapeSet.printShapeSet(tmp15.(0)) in
-//│ set tmp17 = Block.printCode(tmp15.(1)) in
-//│ set block$res2 = undefined in
-//│ end
 //│ > Lit(1)
 //│ > 1
 //│ > Lit(42)
@@ -95,22 +71,22 @@ staged module Expressions with
 //│ > Dyn
 //│ > let scrut = 9
 //│ > if scrut is
-//│ > _ then undefined
-//│ > _ then undefined
+//│ > <unknown case> then <unknown block>
+//│ > <unknown case> then <unknown block>
 //│ > else 0
 //│ > 
 
 :js
 :staging
 class Outside(a)
 staged module ClassInstrumentation with
-  class Inside(a, b)
+  class Inside(a, b) // not printed correctly
   class NoArg
   fun inst1() = new Outside(1)
   fun inst2() = new NoArg
 //│ > class NoArg()
 //│ > 
-//│ > class Inside()
+//│ > class Inside(a, b)
 //│ > 
 //│ > Class(Outside, [Lit(1)])
 //│ > new Outside(1)
@@ -135,8 +111,8 @@ module A with
     fun f() = 1
 //│ ╔══[COMPILATION ERROR] No definition found in scope for member 'B'
 //│ ╟── which references the symbol introduced here
-//│ ║  l.134: 	  staged module B with
+//│ ║  l.110: 	  staged module B with
 //│ ║         	                ^^^^^^
-//│ ║  l.135: 	    fun f() = 1
+//│ ║  l.111: 	    fun f() = 1
 //│ ╙──       	^^^^^^^^^^^^^^^
 //│ ═══[RUNTIME ERROR] ReferenceError: B is not defined

hkmc2/shared/src/test/mlscript/staging/PrintCode.mls

@@ -44,7 +44,7 @@ Block.printCode(Block.Define(Block.FunDefn(Block.Symbol("f"), [Block.Symbol("x")
 
 Block.printCode(
     Block.Define(
-        Block.ClsLikeDefn(Block.Symbol("C"), Some([Block.Symbol("x"), Block.Symbol("y")]), None), 
+        Block.ClsLikeDefn(Block.ClassSymbol("C", Some([Block.Symbol("x"), Block.Symbol("y")])), None), 
         Block.Assign(
             Block.Symbol("x"), 
             Block.Instantiate(
@@ -61,13 +61,15 @@ Block.printCode(
 //│ > let x = new C(1,2)
 //│ > x.y
 
-Block.printCode(Block.Return(Block.Tuple([Block.Arg(None, Block.ValueLit(1)), Block.Arg(None, Block.ValueLit(2))]), false))
-//│ > [1,2]
-
-Block.printCode(Block.Match(Block.ValueLit(2), [Block.Arm(Block.Lit(1), Block.Return(Block.ValueLit(1), false)), Block.Arm(Block.Lit(2), Block.Return(Block.ValueLit(2), false))], Some(Block.Return(Block.ValueLit(3), false)), Block.End()))
+Block.printCode(
+    Block.Match(
+        Block.ValueLit(2),
+        [Block.Arm(Block.Lit(1), Block.Return(Block.ValueLit(1), false)), Block.Arm(Block.Lit(2), Block.Return(Block.ValueLit(2), false))],
+        Some(Block.Return(Block.ValueLit(3), false)), Block.End()
+    )
+)
 //│ > if 2 is
 //│ > 1 then 1
 //│ > 2 then 2
 //│ > else 3
 //│ > 
-