Half way towards a surface syntax.

Author: cristianoc

jscomp/core/record_attributes_check.ml

@@ -82,7 +82,7 @@ let rec check_duplicated_labels_aux (lbls : Parsetree.label_declaration list)
   | [] -> None
   | { pld_name = { txt } as pld_name; pld_attributes } :: rest -> (
       (* TODO: this operates on the parse tree and does not know about expansion *)
-      if Set_string.mem coll txt && txt <> "dotdotdot" then Some pld_name
+      if Set_string.mem coll txt && txt <> "..." then Some pld_name
       else
         let coll_with_lbl = Set_string.add coll txt in
         match Ext_list.find_opt pld_attributes find_name_with_loc with

jscomp/ml/typedecl.ml

@@ -447,7 +447,7 @@ let transl_declaration env sdecl id =
               else Record_regular
           in
           let lbls, lbls' = match lbls, lbls' with
-            | {ld_name = {txt = "dotdotdot"}; ld_type} :: _, _ :: _ ->
+            | {ld_name = {txt = "..."}; ld_type} :: _, _ :: _ ->
               let rec extract t = match t.desc with
                 | Tpoly(t, []) -> extract t
                 | _ -> Ctype.repr t in
@@ -459,7 +459,7 @@ let transl_declaration env sdecl id =
                   ld_loc = l.ld_loc;
                   ld_attributes = l.ld_attributes; } in
               let rec process_lbls acc lbls lbls' = match lbls, lbls' with
-                | {ld_name = {txt = "dotdotdot"}; ld_type} :: rest, _ :: rest' ->
+                | {ld_name = {txt = "..."}; ld_type} :: rest, _ :: rest' ->
                   (match Ctype.extract_concrete_typedecl env (extract ld_type.ctyp_type) with
                     (_p0, _p, {type_kind=Type_record (fields, _repr)}) ->
                       process_lbls (fst acc @ (fields |> List.map mkLbl), snd acc @ fields) rest rest'
@@ -1214,7 +1214,7 @@ let check_duplicates sdecl_list =
           (fun {pld_name=cname;pld_loc=loc} ->
             try
               let name' = Hashtbl.find labels cname.txt in
-              if cname.txt <> "dotdotdot" then
+              if cname.txt <> "..." then
               Location.prerr_warning loc
                 (Warnings.Duplicate_definitions
                    ("label", cname.txt, name', sdecl.ptype_name.txt))

jscomp/test/DotDotDot.res

@@ -1,14 +1,14 @@
 type a = {x: int}
 
-type b = {dotdotdot: a, y: string}
+type b = {\"...": a, y: string}
 
-type c = {dotdotdot: b, z: string}
+type c = {\"...": b, z: string}
 
 let v: c = {x: 10, y: "", z: ""}
 
 type vw = {v: float, w: float}
 
-type cvw = {dotdotdot: c, dotdotdot: vw}
+type cvw = {\"...": c, \"...": vw}
 
 let v2: cvw = {x: 10, y: "", z: "", v: 1.0, w: 2.0}
 
@@ -20,24 +20,24 @@ type globalProps = {
 }
 
 type anchorProps = {
-  dotdotdot: globalProps,
+  \"...": globalProps,
   download?: string,
   href?: string,
   target?: [#_self | #_blank | #_parent | #_top],
 }
 
 // globalProps only case?
-type divProps = {dotdotdot: globalProps}
+type divProps = {\"...": globalProps}
 
 type svgProps = {
-  dotdotdot: globalProps,
+  \"...": globalProps,
   x?: string,
   y?: string,
 }
 
 module MultipleDotDotDots = {
   type t1 = {x: int}
   type t2 = {y: string}
-  type t = {dotdotdot: t1, dotdotdot: t2}
+  type t = {\"...": t1, \"...": t2}
   let x: t = {x: 10, y: "abc"}
 }