wip: add missing trace for methods

need to fix: avoid "toString()"

Author: CrescentonC

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

@@ -128,7 +128,8 @@ class Lowering(using TL, Raise, Elaborator.State):
         Define(ClsLikeDefn(cls.sym, syntax.Cls,
             mtds.flatMap: td =>
               td.body.map: bod =>
-                FunDefn(td.sym, td.params, term(bod)(Ret))
+                val (paramLists, bodyBlock) = setupFunctionDef(td.params, bod, S(td.sym.nme))
+                FunDefn(td.sym, paramLists, bodyBlock)
             ,
             privateFlds,
             publicFlds,
@@ -411,11 +412,11 @@ trait LoweringTraceLog
     val resSym = TempSymbol(N, dbgNme = "traceLogRes")
     val retMsgSym = TempSymbol(N, dbgNme = "traceLogRetMsg")
 
-    val psSyms = params.params.zipWithIndex.flatMap:
-      (p, i) => if i == params.params.length - 1
-        then Arg(false, Value.Ref((p.sym))) :: Arg(false, Value.Lit(Tree.StrLit(")"))) :: Nil
-        else Arg(false, Value.Ref((p.sym))) :: Arg(false, Value.Lit(Tree.StrLit(", "))) :: Nil
-    
+    val psSyms = params.params.zipWithIndex.foldRight[Ls[Arg]](Arg(false, Value.Lit(Tree.StrLit(")"))) :: Nil){
+      case ((p, i), acc) => if i == params.params.length - 1
+        then Arg(false, Value.Ref((p.sym))) :: acc
+        else Arg(false, Value.Ref((p.sym))) :: Arg(false, Value.Lit(Tree.StrLit(", "))) :: acc
+    }
 
     assignStmts(
       enterMsgSym -> Call(

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

@@ -133,3 +133,99 @@ f(1,1)(1)
 //│ > | return: 0
 //│ > return: 2
 //│ = 2
+
+
+// FIXME: problem of infinite loop..?
+:sjs
+abstract class E: S | N
+class S(x) with
+  fun toString() = "S(" + x + ")"
+class N() with
+  fun toString() = "N"
+//│ JS:
+//│ let tmp;
+//│ tmp = this.Predef.TraceLogger.resetIndent(0) ?? null;
+//│ this.E = class E {
+//│   constructor() {
+//│     
+//│   }
+//│   toString() { return "E"; }
+//│ };
+//│ this.S = function S(...args1) { return new S.class(...args1); };
+//│ this.S.class = class S {
+//│   constructor(x) {
+//│     this.x = x;
+//│     
+//│   }
+//│   toString(...args) {
+//│     globalThis.Predef.checkArgs("toString", 0, true, args.length);
+//│     let traceLogEnterMsg, traceLogPrevIndent, traceLogRes, traceLogRetMsg, tmp1, tmp2, tmp3, tmp4;
+//│     traceLogEnterMsg = globalThis.String.prototype.concat.call("calling: toString(", ")") ?? null;
+//│     tmp1 = globalThis.Predef.TraceLogger.log(traceLogEnterMsg) ?? null;
+//│     traceLogPrevIndent = globalThis.Predef.TraceLogger.indent() ?? null;
+//│     tmp2 = "S(" + this.x;
+//│     traceLogRes = tmp2 + ")";
+//│     traceLogRetMsg = globalThis.String.prototype.concat.call("return: ", traceLogRes) ?? null;
+//│     tmp3 = globalThis.Predef.TraceLogger.resetIndent(traceLogPrevIndent) ?? null;
+//│     tmp4 = globalThis.Predef.TraceLogger.log(traceLogRetMsg) ?? null;
+//│     return traceLogRes;
+//│   }
+//│ };
+//│ this.N = function N(...args1) { return new N.class(...args1); };
+//│ this.N.class = class N {
+//│   constructor() {
+//│     
+//│   }
+//│   toString(...args) {
+//│     globalThis.Predef.checkArgs("toString", 0, true, args.length);
+//│     let traceLogEnterMsg, traceLogPrevIndent, traceLogRes, traceLogRetMsg, tmp1, tmp2, tmp3;
+//│     traceLogEnterMsg = globalThis.String.prototype.concat.call("calling: toString(", ")") ?? null;
+//│     tmp1 = globalThis.Predef.TraceLogger.log(traceLogEnterMsg) ?? null;
+//│     traceLogPrevIndent = globalThis.Predef.TraceLogger.indent() ?? null;
+//│     traceLogRes = "N";
+//│     traceLogRetMsg = globalThis.String.prototype.concat.call("return: ", traceLogRes) ?? null;
+//│     tmp2 = globalThis.Predef.TraceLogger.resetIndent(traceLogPrevIndent) ?? null;
+//│     tmp3 = globalThis.Predef.TraceLogger.log(traceLogRetMsg) ?? null;
+//│     return traceLogRes;
+//│   }
+//│ };
+//│ undefined
+
+:sjs
+fun id(x) = x
+id(S(S(N())))
+//│ JS:
+//│ let tmp, tmp1, tmp2, tmp3;
+//│ tmp = this.Predef.TraceLogger.resetIndent(0) ?? null;
+//│ function id(...args) {
+//│   globalThis.Predef.checkArgs("id", 1, true, args.length);
+//│   let x = args[0];
+//│   let traceLogEnterMsg, traceLogPrevIndent, traceLogRes, traceLogRetMsg, tmp4, tmp5, tmp6;
+//│   traceLogEnterMsg = globalThis.String.prototype.concat.call("calling: id(", x, ")") ?? null;
+//│   tmp4 = globalThis.Predef.TraceLogger.log(traceLogEnterMsg) ?? null;
+//│   traceLogPrevIndent = globalThis.Predef.TraceLogger.indent() ?? null;
+//│   traceLogRes = x;
+//│   traceLogRetMsg = globalThis.String.prototype.concat.call("return: ", traceLogRes) ?? null;
+//│   tmp5 = globalThis.Predef.TraceLogger.resetIndent(traceLogPrevIndent) ?? null;
+//│   tmp6 = globalThis.Predef.TraceLogger.log(traceLogRetMsg) ?? null;
+//│   return traceLogRes;
+//│ }
+//│ tmp1 = this.N() ?? null;
+//│ tmp2 = this.S(tmp1) ?? null;
+//│ tmp3 = this.S(tmp2) ?? null;
+//│ this.id(tmp3) ?? null
+//│ > calling: toString()
+//│ > | calling: toString()
+//│ > | | calling: toString()
+//│ > | | return: N
+//│ > | return: S(N)
+//│ > return: S(S(N))
+//│ > calling: id(S(S(N)))
+//│ > | calling: toString()
+//│ > | | calling: toString()
+//│ > | | | calling: toString()
+//│ > | | | return: N
+//│ > | | return: S(N)
+//│ > | return: S(S(N))
+//│ > return: S(S(N))
+//│ = S { x: S { x: N {} } }