Skip to content

Commit 23cbac2

Browse files
committed
cleanup
1 parent e302925 commit 23cbac2

File tree

1 file changed

+6
-23
lines changed

1 file changed

+6
-23
lines changed

hkmc2/shared/src/main/scala/hkmc2/codegen/js/JSBuilder.scala

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -225,18 +225,8 @@ class JSBuilder(using Elaborator.State, Elaborator.Ctx) extends CodeBuilder:
225225
doc" # const $proxy = this; # ${res.stripBreaks}${returningTerm(rst)}"
226226
case _ => doc"$res${returningTerm(rst)}"
227227
doc" # ${resJS}"
228-
case Return(res, true) =>
229-
// val resSym = semantics.TempSymbol(N, "res")
230-
// val resStr = scope.allocateName(resSym)
231-
// doc" # const $resStr = ${result(res)}; # Predef.TraceLogger.indent = prevIndent; # Predef.TraceLogger.log(${JSBuilder.makeStringLiteral("return ")} + $resStr); # ${resStr}"
232-
doc" # ${result(res)}"
233-
case Return(res, false) =>
234-
// val resSym = semantics.TempSymbol(N, "res")
235-
// val resStr = scope.allocateName(resSym)
236-
// // doc" # const $resStr = ${result(res)}; # return ${resStr}"
237-
// doc" # const $resStr = ${result(res)}; # Predef.TraceLogger.indent = prevIndent; # Predef.TraceLogger.log(${JSBuilder.makeStringLiteral("return ")} + $resStr); # return ${resStr}"
238-
// // doc" # return ${result(res)};"
239-
setupReturn(res)
228+
case Return(res, true) => doc" # ${result(res)}"
229+
case Return(res, false) => doc" # return ${result(res)};"
240230

241231
// TODO factor out common logic
242232
case Match(scrut, Case.Lit(syntax.Tree.BoolLit(true)) -> trm :: Nil, els, rest) =>
@@ -329,14 +319,10 @@ class JSBuilder(using Elaborator.State, Elaborator.Ctx) extends CodeBuilder:
329319
val v = doc"this.${getVar(i._1)}"
330320
doc"""$v = await import("${i._2.toString
331321
}"); # if ($v.default !== undefined) $v = $v.default;"""
332-
// val traceLoggerSymbol = semantics.TempSymbol(N, "traceLogger")
333-
// val traceLoggerStr = Scope.scope.allocateName(traceLoggerSymbol)
334-
imps.mkDocument(doc" # ") ::
335-
(if !compilingFile && false then doc"let = new Predef.TraceLogger(); # " else "") :/:
336-
block(p.main) :: (
337-
exprt match
338-
case S(e) => doc"\nexport default ${e};\n"
339-
case N => doc""
322+
imps.mkDocument(doc" # ") :/: block(p.main) :: (
323+
exprt match
324+
case S(e) => doc"\nexport default ${e};\n"
325+
case N => doc""
340326
)
341327

342328
def block(t: Block)(using Raise, Scope): Document =
@@ -357,9 +343,6 @@ class JSBuilder(using Elaborator.State, Elaborator.Ctx) extends CodeBuilder:
357343
.++(params.restParam.map(p => "..." + scope.allocateName(p.sym)))
358344
.mkDocument(", ")
359345
(paramsList, this.body(body))
360-
361-
def setupReturn(res: Result)(using Raise, Scope): Document =
362-
doc" # return ${result(res)};"
363346

364347

365348
def setupCall(bases: Document, args: Document)(using Raise, Scope): Document =

0 commit comments

Comments
 (0)