Add flags to TermDefinition

Author: FlandiaYingman

hkmc2/shared/src/main/scala/hkmc2/bbml/bbML.scala

@@ -407,13 +407,13 @@ class BBTyper(using elState: Elaborator.State, tl: TL):
             effBuff += eff
             nestCtx += sym -> rhsTy
             goStats(stats)
-          case TermDefinition(_, Fun, sym, ParamList(_, ps) :: Nil, sig, Some(body), _) :: stats =>
+          case TermDefinition(_, Fun, sym, ParamList(_, ps) :: Nil, sig, Some(body), _, _) :: stats =>
             typeFunDef(sym, Term.Lam(ps, body), sig, ctx)
             goStats(stats)
-          case TermDefinition(_, Fun, sym, Nil, sig, Some(body), _) :: stats =>
+          case TermDefinition(_, Fun, sym, Nil, sig, Some(body), _, _) :: stats =>
             typeFunDef(sym, body, sig, ctx)  // * may be a case expressions
             goStats(stats)
-          case TermDefinition(_, Fun, sym, _, S(sig), None, _) :: stats =>
+          case TermDefinition(_, Fun, sym, _, S(sig), None, _, _) :: stats =>
             ctx += sym -> typeType(sig)
             goStats(stats)
           case (clsDef: ClassDef) :: stats =>

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

@@ -485,7 +485,8 @@ extends Importer:
               val b = rhs.map(term(_)(using newCtx))
               val r = FlowSymbol(s"‹result of ${sym}›", nextUid)
               val tdf = TermDefinition(owner, k, sym, pss,
-                td.signature.orElse(newSignatureTrees.get(id.name)).map(term), b, r)
+                td.signature.orElse(newSignatureTrees.get(id.name)).map(term), b, r,
+                TermDefFlags.empty)
               sym.defn = S(tdf)
               tdf
             go(sts, tdf :: acc)
@@ -654,7 +655,7 @@ extends Importer:
   def computeVariances(s: Statement): Unit =
     val trav = VarianceTraverser()
     def go(s: Statement): Unit = s match
-      case TermDefinition(_, k, sym, pss, sign, body, r) =>
+      case TermDefinition(_, k, sym, pss, sign, body, r, _) =>
         pss.foreach(ps => ps.params.foreach(trav.traverseType(S(false))))
         sign.foreach(trav.traverseType(S(true)))
         body match

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

@@ -3,6 +3,7 @@ package semantics
 
 import mlscript.utils.*, shorthands.*
 import syntax.*
+import scala.collection.mutable.Buffer
 
 
 final case class QuantVar(sym: VarSymbol, ub: Opt[Term], lb: Opt[Term])
@@ -101,7 +102,7 @@ sealed trait Statement extends AutoLocated:
     case RegRef(reg, value) => reg :: value :: Nil
     case Assgn(lhs, rhs) => lhs :: rhs :: Nil
     case Deref(term) => term :: Nil
-    case TermDefinition(_, k, _, ps, sign, body, res) =>
+    case TermDefinition(_, k, _, ps, sign, body, res, _) =>
       ps.toList.flatMap(_.subTerms) ::: sign.toList ::: body.toList
     case cls: ClassDef =>
       cls.paramsOpt.toList.flatMap(_.flatMap(_.subTerms)) ::: cls.body.blk :: Nil
@@ -169,7 +170,7 @@ sealed trait Statement extends AutoLocated:
     case CompType(lhs, rhs, pol) => s"${lhs.showDbg} ${if pol then "|" else "&"} ${rhs.showDbg}"
     case Error => "<error>"
     case Tup(fields) => fields.map(_.showDbg).mkString("[", ", ", "]")
-    case TermDefinition(_, k, sym, ps, sign, body, res) => s"${k.str} ${sym}${
+    case TermDefinition(_, k, sym, ps, sign, body, res, flags) => s"${flags} ${k.str} ${sym}${
       ps.map(_.showDbg).mkString("")
     }${sign.fold("")(": "+_.showDbg)}${
       body match
@@ -186,6 +187,15 @@ final case class LetDecl(sym: LocalSymbol) extends Statement
 
 final case class DefineVar(sym: LocalSymbol, rhs: Term) extends Statement
 
+final case class TermDefFlags(mod: Bool):
+  def showDbg: Str = 
+    val flags = Buffer.empty[String]
+    if mod then flags += "module"
+    flags.mkString(" ")
+  override def toString: String = "‹" + showDbg + "›"
+
+object TermDefFlags { val empty: TermDefFlags = TermDefFlags(false) }
+
 final case class TermDefinition(
     owner: Opt[InnerSymbol],
     k: TermDefKind,
@@ -194,6 +204,7 @@ final case class TermDefinition(
     sign: Opt[Term],
     body: Opt[Term],
     resSym: FlowSymbol,
+    flags: TermDefFlags,
 ) extends Companion
 
 case class ObjBody(blk: Term.Blk):
@@ -273,8 +284,14 @@ case class TypeDef(
 
 
 // TODO Store optional source locations for the flags instead of booleans
-final case class FldFlags(mut: Bool, spec: Bool, genGetter: Bool):
-  def showDbg: Str = (if mut then "mut " else "") + (if spec then "spec " else "") + (if genGetter then "val " else "")
+final case class FldFlags(mut: Bool, spec: Bool, genGetter: Bool, mod: Bool):
+  def showDbg: Str = 
+    val flags = Buffer.empty[String]
+    if mut then flags += "mut"
+    if spec then flags += "spec"
+    if genGetter then flags += "gen"
+    if mod then flags += "module"
+    flags.mkString(" ")
   override def toString: String = "‹" + showDbg + "›"
 
 final case class Fld(flags: FldFlags, value: Term, asc: Opt[Term]) extends FldImpl

hkmc2/shared/src/main/scala/hkmc2/utils/utils.scala

@@ -20,6 +20,7 @@ extension (s: String)
     .mkString("\"", "", "\"")
 
 
+import hkmc2.semantics.TermDefFlags
 import hkmc2.semantics.FldFlags
 import scala.collection.mutable.Buffer
 import mlscript.utils.StringOps
@@ -36,12 +37,17 @@ extension (t: Product)
       case Nil => "Nil"
       case xs: List[_] => "Ls of \n" + xs.iterator.map(aux(_)).mkString("\n").indent("  ")
       case s: String => s.escaped
-      case FldFlags(mut, spec, genGetter) =>
+      case TermDefFlags(mod) =>
+        val flags = Buffer.empty[String]
+        if mod then flags += "module"
+        flags.mkString("(", ", ", ")")
+      case FldFlags(mut, spec, genGetter, mod) =>
         val flags = Buffer.empty[String]
         if mut then flags += "mut"
         if spec then flags += "spec"
         if genGetter then flags += "gen"
-        if flags.isEmpty then "()" else flags.mkString("(", ", ", ")")
+        if mod then flags += "module"
+        flags.mkString("(", ", ", ")")
       case t: Product => t.showAsTree(inTailPos)
       case v => v.toString
     val postfix = post(t)