Skip to content

Commit 7811493

Browse files
cristianoccometkim
authored andcommitted
Refactor: split tags.
1 parent 25caa8e commit 7811493

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

jscomp/gentype/EmitType.ml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,16 +195,15 @@ let rec renderType ~(config : Config.t) ?(indent = None) ~typeNameIsInterface
195195
t |> renderType ~config ~indent ~typeNameIsInterface ~inFunType
196196
in
197197
let tagField =
198-
case |> labelJSToString
199-
|> field ~name:(Runtime.jsVariantTag ~polymorphic:false)
198+
case |> labelJSToString |> field ~name:Runtime.jsVariantTag
200199
in
201200
match (unboxed, type_) with
202201
| true, type_ -> type_ |> render
203202
| false, type_ when polymorphic ->
204203
(* poly variant *)
205204
[
206205
case |> labelJSToString
207-
|> field ~name:(Runtime.jsVariantTag ~polymorphic);
206+
|> field ~name:Runtime.jsPolymorphicVariantTag;
208207
type_ |> render
209208
|> field ~name:(Runtime.jsVariantValue ~polymorphic);
210209
]

jscomp/gentype/Runtime.ml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@ let rec emitModuleAccessPath ~config moduleAccessPath =
2424
| Dot (p, moduleItem) ->
2525
p |> emitModuleAccessPath ~config |> EmitText.fieldAccess ~label:moduleItem
2626

27-
let jsVariantTag ~polymorphic =
28-
match polymorphic with
29-
| true -> "NAME"
30-
| false -> "TAG"
27+
let jsVariantTag = "TAG"
28+
let jsPolymorphicVariantTag = "NAME"
3129

3230
let jsVariantPayloadTag ~n = "_" ^ string_of_int n
3331

jscomp/gentype/Runtime.mli

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ val newModuleItem : name:string -> moduleItem
1515
val newRecordValue : unboxed:bool -> recordGen -> recordValue
1616
val recordGen : unit -> recordGen
1717
val recordValueToString : recordValue -> string
18-
val jsVariantTag : polymorphic:bool -> string
18+
val jsVariantTag : string
19+
val jsPolymorphicVariantTag : string
1920
val jsVariantPayloadTag : n:int -> string
2021
val jsVariantValue : polymorphic:bool -> string

0 commit comments

Comments
 (0)