Use sub-module (#380)

Author: NeilKleistGao

hkmc2/shared/src/main/scala/hkmc2/semantics/Elaborator.scala

@@ -309,7 +309,6 @@ object Elaborator:
     val orSymbol = builtinOpsMap("||")
     def init(using State): Ctx = Ctx.empty.copy(env = Map(
       "globalThis" -> globalThisSymbol,
-      "Term" -> termSymbol,
     ))
     def dbg: Bool = false
     def dbgRefNum(num: Int): Str =

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

@@ -4,6 +4,7 @@ import runtime from "./Runtime.mjs";
 import RuntimeJS from "./RuntimeJS.mjs";
 import Runtime from "./Runtime.mjs";
 import Rendering from "./Rendering.mjs";
+import Term from "./Term.mjs";
 let Predef1;
 (class Predef {
   static {
@@ -39,6 +40,22 @@ let Predef1;
     this.render = Rendering.render;
     this.assert = globalThis.console.assert;
     this.foldl = Predef.fold;
+    (class meta {
+      static {
+        Predef.meta = this
+      }
+      constructor() {
+        runtime.Unit;
+      }
+      static codegen(t, file) {
+        return Term.codegen(t, file)
+      } 
+      static print(t) {
+        return runtime.safeCall(Term.print(t))
+      }
+      toString() { return runtime.render(this); }
+      static [definitionMetadata] = ["class", "meta"]; 
+    });
   }
   static id(x) {
     return x

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

@@ -5,6 +5,7 @@ import "./RuntimeJS.mjs"
 // * TODO: proper caching of parsed/elaborated files
 import "./Runtime.mjs"
 import "./Rendering.mjs"
+import "./Term.mjs"
 // import "./Runtime.mls"
 // import "./Rendering.mls"
 
@@ -126,3 +127,6 @@ fun raiseUnhandledEffect() =
   Runtime.mkEffect(Runtime.FatalEffect, null)
 
 
+module meta with
+  fun codegen(t, file) = Term.codegen(t, file)
+  fun print(t) = Term.print(t)

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

@@ -3,46 +3,46 @@
 
 
 
-Term.print
+meta.print
 //│ = fun print
 
 
-Term.print(`42)
+meta.print(`42)
 //│ > 42
 
 
-Term.print(`+)
+meta.print(`+)
 //│ > +
 
 
-Term.print(`1 `+ `2)
+meta.print(`1 `+ `2)
 //│ > (+)(1, 2)
 
 
-Term.print(x `=> x)
+meta.print(x `=> x)
 //│ > (x_0) =>
 //│ >   x_0
 
 
-Term.print((x, y) `=> x `+ y)
+meta.print((x, y) `=> x `+ y)
 //│ > (x_0, y_0) =>
 //│ >   (+)(x_0, y_0)
 
 
-Term.print(`let x = `42 `in x)
+meta.print(`let x = `42 `in x)
 //│ > let x_0
 //│ > x_0 = 42
 //│ > x_0
 
 
-Term.print(`if `true then `true else `false)
+meta.print(`if `true then `true else `false)
 //│ > if 
 //│ >   let scrut_0 = true
 //│ >   scrut_0 is true then true
 //│ >   else false
 
 
-Term.print(x `=> `if x `=== `0.0 then `1.0 else x)
+meta.print(x `=> `if x `=== `0.0 then `1.0 else x)
 //│ > (x_0) =>
 //│ >   if 
 //│ >     let scrut_0 = (===)(x_0, 0)
@@ -72,7 +72,7 @@ QuoteInc.res(42)
 import "../../mlscript-compile/CSP.mls"
 
 
-Term.codegen(CSP.foo(), "./hkmc2/shared/src/test/mlscript-compile/quotes/CSPFoo.mls")
+meta.codegen(CSP.foo(), "./hkmc2/shared/src/test/mlscript-compile/quotes/CSPFoo.mls")
 
 
 import "../../mlscript-compile/quotes/CSPFoo.mls"
@@ -82,7 +82,7 @@ CSPFoo.res
 //│ = 124
 
 
-Term.codegen(CSP.bar(), "./hkmc2/shared/src/test/mlscript-compile/quotes/CSPBar.mls")
+meta.codegen(CSP.bar(), "./hkmc2/shared/src/test/mlscript-compile/quotes/CSPBar.mls")
 
 
 import "../../mlscript-compile/quotes/CSPBar.mls"
@@ -92,7 +92,7 @@ CSPBar.res
 //│ = 1
 
 
-Term.codegen(CSP.baz(), "./hkmc2/shared/src/test/mlscript-compile/quotes/CSPBaz.mls")
+meta.codegen(CSP.baz(), "./hkmc2/shared/src/test/mlscript-compile/quotes/CSPBaz.mls")
 
 
 import "../../mlscript-compile/quotes/CSPBaz.mls"

hkmc2/shared/src/test/mlscript/ctx/Summon.mls

@@ -19,7 +19,7 @@ use[Num]
 //│ ║  l.17: 	use[Num]
 //│ ║        	^^^^^^^^
 //│ ╟── Required by contextual parameter declaration: 
-//│ ║  l.115: 	fun use[T](using instance: T) = instance
+//│ ║  l.116: 	fun use[T](using instance: T) = instance
 //│ ║         	                 ^^^^^^^^^^^
 //│ ╙── Missing instance: Expected: Num (type parameter T); Available: Int, Str
 //│ ═══[RUNTIME ERROR] Error: MLscript call unexpectedly returned `undefined`, the forbidden value.
@@ -55,7 +55,7 @@ fun f(using Int) = use[Num]
 //│ ║  l.53: 	fun f(using Int) = use[Num]
 //│ ║        	                   ^^^^^^^^
 //│ ╟── Required by contextual parameter declaration: 
-//│ ║  l.115: 	fun use[T](using instance: T) = instance
+//│ ║  l.116: 	fun use[T](using instance: T) = instance
 //│ ║         	                 ^^^^^^^^^^^
 //│ ╙── Missing instance: Expected: Num (type parameter T); Available: Int, Str
 
@@ -79,7 +79,7 @@ use{[Some[Int]].value}
 //│ ║  l.74: 	use{[Some[Int]].value}
 //│ ║        	^^^
 //│ ╟── Required by contextual parameter declaration: 
-//│ ║  l.115: 	fun use[T](using instance: T) = instance
+//│ ║  l.116: 	fun use[T](using instance: T) = instance
 //│ ║         	                 ^^^^^^^^^^^
 //│ ╙── Illegal query for an unspecified type variable T.
 //│ ═══[RUNTIME ERROR] Error: MLscript call unexpectedly returned `undefined`, the forbidden value.
@@ -91,7 +91,7 @@ use([Some[Int]].value)
 //│ ║  l.89: 	use([Some[Int]].value)
 //│ ║        	^^^
 //│ ╟── Required by contextual parameter declaration: 
-//│ ║  l.115: 	fun use[T](using instance: T) = instance
+//│ ║  l.116: 	fun use[T](using instance: T) = instance
 //│ ║         	                 ^^^^^^^^^^^
 //│ ╙── Illegal query for an unspecified type variable T.
 //│ ═══[RUNTIME ERROR] Error: MLscript call unexpectedly returned `undefined`, the forbidden value.