Lua syntax: Use TypedSyntax.VId for Label

minoki · Sep 8, 2024 · c8fb6c3 · c8fb6c3
1 parent bf552f8
commit c8fb6c3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/codegen-lua.sml b/src/codegen-lua.sml
@@ -212,7 +212,7 @@ struct
         [L.CallStat (L.VarExp (L.PredefinedId "_id"), vector [e])]
 
   datatype cont_type =
-    GOTO of {label: L.Id, params: (L.Id option) list}
+    GOTO of {label: TypedSyntax.VId, params: (L.Id option) list}
   | RETURN
   type Env = {continuations: cont_type C.CVarMap.map}
 
@@ -244,7 +244,7 @@ struct
     | NONE => raise CodeGenError "undefined continuation"
 
   fun doLabel cname =
-    L.UserDefinedId (TypedSyntax.MkVId ("cont", C.CVar.toInt cname))
+    TypedSyntax.MkVId ("cont", C.CVar.toInt cname)
 
   fun doValue ctx (C.Var vid) =
         (case VIdToLua (ctx, vid) of
@@ -2950,11 +2950,11 @@ struct
         in
           if C.containsApp thenCont then
             let
-              val thenLabel = L.UserDefinedId (genSymWithName (ctx, "then"))
+              val thenLabel = genSymWithName (ctx, "then")
             in
               if containsNestedBlock elseCont then
                 let
-                  val elseLabel = L.UserDefinedId (genSymWithName (ctx, "else"))
+                  val elseLabel = genSymWithName (ctx, "else")
                 in
                   L.IfStat
                     ( doValue ctx cond

diff --git a/src/lua-syntax.sml b/src/lua-syntax.sml
@@ -6,7 +6,7 @@ structure LuaSyntax :>
 sig
   datatype TableKey = IntKey of int | StringKey of string
   datatype Id = PredefinedId of string | UserDefinedId of TypedSyntax.VId
-  type Label = Id
+  type Label = TypedSyntax.VId
   structure IdSet: ORD_SET where type Key.ord_key = Id
   structure IdMap: ORD_MAP where type Key.ord_key = Id
   datatype VarAttr = CONST | LATE_INIT | MUTABLE
@@ -76,7 +76,7 @@ end =
 struct
   datatype TableKey = IntKey of int | StringKey of string
   datatype Id = PredefinedId of string | UserDefinedId of TypedSyntax.VId
-  type Label = Id
+  type Label = TypedSyntax.VId
   structure IdKey =
   struct
     type ord_key = Id
@@ -580,7 +580,7 @@ struct
           labelMap (* TypedSyntax.VIdMap.inDomain (labelMap, label) should be true *)
     and createLabelMapForBlock (unavailableLabels, labelMap, block) =
       let
-        fun go (L.LabelStat label, acc) = declareId (label, acc)
+        fun go (L.LabelStat label, acc) = declare (label, acc)
           | go (_, acc) = acc
         val (unavailableLabels, labelMap) =
           (Vector.foldl go (unavailableLabels, labelMap) block)
@@ -1017,14 +1017,14 @@ struct
             doStat
               ( rest
               , Indent :: Fragment "goto "
-                :: idToFragment labelMap label @ LineTerminator :: acc
+                :: vidToFragment labelMap label @ LineTerminator :: acc
               )
         | doStat (LuaSyntax.LabelStat label :: rest, acc) =
             doStat
               ( rest
               , Indent :: Fragment "::"
                 ::
-                idToFragment labelMap label
+                vidToFragment labelMap label
                 @ Fragment "::" :: LineTerminator :: acc
               )
       and doBlock stats =