temp

Author: FlandiaYingman

hkmc2/shared/src/main/scala/hkmc2/codegen/wasm/text/Wasm.scala

@@ -5,7 +5,7 @@ package text
 import mlscript.utils.*, shorthands.*
 
 import document.*
-import semantics.DefinitionSymbol
+import semantics.FieldSymbol
 
 import scala.collection.Map
 
@@ -124,7 +124,7 @@ case class Field(
       })"
 
 /** A type representing a structure type. */
-case class StructType(fields: Map[DefinitionSymbol[?], NumIdx -> Field]) extends ToWat:
+case class StructType(fields: Map[FieldSymbol, NumIdx -> Field]) extends ToWat:
 
   def fieldSeq: Seq[Field] = fields.values.toSeq.sortBy(_._1.index).map(_._2)
 

hkmc2/shared/src/main/scala/hkmc2/codegen/wasm/text/WatBuilder.scala

@@ -115,7 +115,7 @@ class WatBuilder(using TraceLogger, State) extends CodeBuilder:
       )
     case r => result(r)
 
-  def fieldSelect(thisSym: BlockMemberSymbol, sym: DefinitionSymbol[?])(using Ctx, Raise): FieldIdx =
+  def fieldSelect(thisSym: BlockMemberSymbol, sym: FieldSymbol)(using Ctx, Raise): FieldIdx =
     val structInfo = ctx.getTypeInfo_!(thisSym)
     val symToField = structInfo.compType match
       case ty: StructType => ty.fields
@@ -150,13 +150,13 @@ class WatBuilder(using TraceLogger, State) extends CodeBuilder:
       ref.i31(i32.const(if value then 1 else 0))
     case Value.Lit(IntLit(value)) =>
       ref.i31(i32.const(value.toInt))
-    case Value.Ref(l, _) =>
+    case Value.Ref(l) =>
       ctx.getFunc(l) match
         case S(funcIdx) =>
           ref.func(funcIdx, RefType(ctx.getFuncInfo_!(l).typeIdx, nullable = false))
         case N => getVar(l, r.toLoc)
 
-    case Call(Value.Ref(l: BuiltinSymbol, _), lhs :: rhs :: Nil) if !l.functionLike =>
+    case Call(Value.Ref(l: BuiltinSymbol), lhs :: rhs :: Nil) if !l.functionLike =>
       if l.binary then
         l.nme match
           case "+" =>
@@ -231,7 +231,7 @@ class WatBuilder(using TraceLogger, State) extends CodeBuilder:
 
     case sel @ Select(qual, id) =>
       val qualRes = result(qual)
-      val selSym = sel.symbol_SelectSymbol getOrElse:
+      val selSym = sel.symbol getOrElse:
         lastWords(s"Symbol for Select(...) expression must be resolved")
       val selTrmSym = selSym match
         case termSym: TermSymbol => termSym
@@ -260,7 +260,7 @@ class WatBuilder(using TraceLogger, State) extends CodeBuilder:
             ),
             extraInfo = S(s"Block IR of `cls` expression: ${cls.toString}")
           )
-      val ctorClsSym = ctorClsPath.symbol_SelectSymbol match
+      val ctorClsSym = ctorClsPath.symbol match
         case S(sym) => sym
         case N => return errExpr(
             Ls(