Skip to content

Commit 78e0a05

Browse files
bobzhangbobzhang
committed
snapshot
1 parent f7a218b commit 78e0a05

File tree

5 files changed

+64
-94
lines changed

5 files changed

+64
-94
lines changed

‎lib/4.06.1/unstable/all_ounit_tests.ml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17943,9 +17943,6 @@ type object_field =
1794317943
val object_field : Asttypes.label Asttypes.loc -> attributes -> core_type -> object_field
1794417944

1794517945

17946-
val hash_label : poly_var_label -> hash_label
17947-
17948-
val label_of_name : poly_var_label -> string
1794917946

1795017947
type args =
1795117948
(Asttypes.arg_label * Parsetree.expression) list
@@ -18227,8 +18224,6 @@ let object_field l attrs ty =
1822718224

1822818225

1822918226

18230-
let hash_label (x : poly_var_label) : hash_label = x.txt
18231-
let label_of_name (x : poly_var_label) : string = x.txt
1823218227

1823318228
type args =
1823418229
(Asttypes.arg_label * Parsetree.expression) list

‎lib/4.06.1/unstable/js_compiler.ml

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -94298,9 +94298,6 @@ type object_field =
9429894298
val object_field : Asttypes.label Asttypes.loc -> attributes -> core_type -> object_field
9429994299

9430094300

94301-
val hash_label : poly_var_label -> hash_label
94302-
94303-
val label_of_name : poly_var_label -> string
9430494301

9430594302
type args =
9430694303
(Asttypes.arg_label * Parsetree.expression) list
@@ -94582,8 +94579,6 @@ let object_field l attrs ty =
9458294579

9458394580

9458494581

94585-
let hash_label (x : poly_var_label) : hash_label = x.txt
94586-
let label_of_name (x : poly_var_label) : string = x.txt
9458794582

9458894583
type args =
9458994584
(Asttypes.arg_label * Parsetree.expression) list
@@ -405651,16 +405646,14 @@ let map_row_fields_into_ints ptyp_loc
405651405646
Ext_list.fold_left row_fields (0, [])
405652405647
(fun (i,acc) rtag ->
405653405648
match rtag with
405654-
| Rtag (label, attrs, true, [])
405649+
| Rtag ({txt}, attrs, true, [])
405655405650
->
405656-
begin match Ast_attributes.iter_process_bs_int_as attrs with
405657-
| Some i ->
405658-
i + 1,
405659-
((Ast_compatible.hash_label label , i):: acc )
405660-
| None ->
405661-
i + 1 ,
405662-
((Ast_compatible.hash_label label , i):: acc )
405663-
end
405651+
let i =
405652+
match Ast_attributes.iter_process_bs_int_as attrs with
405653+
| Some i -> i | None -> i
405654+
in
405655+
i + 1,
405656+
((txt , i):: acc )
405664405657
| _ ->
405665405658
Bs_syntaxerr.err ptyp_loc Invalid_bs_int_type
405666405659
) in
@@ -405710,22 +405703,22 @@ let map_row_fields_into_strings ptyp_loc
405710405703
Ext_list.fold_right row_fields (`Nothing, []) (fun tag (nullary, acc) ->
405711405704
match nullary, tag with
405712405705
| (`Nothing | `Null),
405713-
Rtag (label, attrs, true, [])
405706+
Rtag ({txt}, attrs, true, [])
405714405707
->
405715405708
let name =
405716405709
match Ast_attributes.iter_process_bs_string_as attrs with
405717405710
| Some name ->
405718405711
has_bs_as := true; name
405719-
| None -> label.txt
405720-
in `Null, (label.txt, name) :: acc
405721-
| (`Nothing | `NonNull), Rtag(label, attrs, false, ([ _ ]))
405712+
| None -> txt
405713+
in `Null, (txt, name) :: acc
405714+
| (`Nothing | `NonNull), Rtag({txt}, attrs, false, ([ _ ]))
405722405715
->
405723405716
let name =
405724405717
match Ast_attributes.iter_process_bs_string_as attrs with
405725405718
| Some name ->
405726405719
has_bs_as := true; name
405727-
| None -> label.txt
405728-
in `NonNull, (label.txt, name) :: acc
405720+
| None -> txt
405721+
in `NonNull, (txt, name) :: acc
405729405722
| _ -> Bs_syntaxerr.err ptyp_loc Invalid_bs_string_type
405730405723

405731405724
) in
@@ -406048,16 +406041,17 @@ let init () =
406048406041
| Some row_fields ->
406049406042
let expConstantArray =
406050406043
Exp.ident {loc; txt = Longident.Lident constantArray} in
406044+
(* let has_bs_as = ref false in *)
406051406045
let result : _ list =
406052406046
Ext_list.map row_fields (fun tag ->
406053406047
match tag with
406054-
| Rtag (label, attrs, _, []) ->
406055-
(Ast_compatible.hash_label label,
406048+
| Rtag ({txt}, attrs, _, []) ->
406049+
(txt,
406056406050
match Ast_attributes.iter_process_bs_string_as_ast attrs with
406057406051
| Some name ->
406058406052
name
406059406053
| None ->
406060-
Ast_compatible.const_exp_string(Ast_compatible.label_of_name label)
406054+
Ast_compatible.const_exp_string txt
406061406055
)
406062406056
| _ -> assert false (* checked by [is_enum_polyvar] *)
406063406057
) in

‎lib/4.06.1/unstable/js_refmt_compiler.ml

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -94298,9 +94298,6 @@ type object_field =
9429894298
val object_field : Asttypes.label Asttypes.loc -> attributes -> core_type -> object_field
9429994299

9430094300

94301-
val hash_label : poly_var_label -> hash_label
94302-
94303-
val label_of_name : poly_var_label -> string
9430494301

9430594302
type args =
9430694303
(Asttypes.arg_label * Parsetree.expression) list
@@ -94582,8 +94579,6 @@ let object_field l attrs ty =
9458294579

9458394580

9458494581

94585-
let hash_label (x : poly_var_label) : hash_label = x.txt
94586-
let label_of_name (x : poly_var_label) : string = x.txt
9458794582

9458894583
type args =
9458994584
(Asttypes.arg_label * Parsetree.expression) list
@@ -405651,16 +405646,14 @@ let map_row_fields_into_ints ptyp_loc
405651405646
Ext_list.fold_left row_fields (0, [])
405652405647
(fun (i,acc) rtag ->
405653405648
match rtag with
405654-
| Rtag (label, attrs, true, [])
405649+
| Rtag ({txt}, attrs, true, [])
405655405650
->
405656-
begin match Ast_attributes.iter_process_bs_int_as attrs with
405657-
| Some i ->
405658-
i + 1,
405659-
((Ast_compatible.hash_label label , i):: acc )
405660-
| None ->
405661-
i + 1 ,
405662-
((Ast_compatible.hash_label label , i):: acc )
405663-
end
405651+
let i =
405652+
match Ast_attributes.iter_process_bs_int_as attrs with
405653+
| Some i -> i | None -> i
405654+
in
405655+
i + 1,
405656+
((txt , i):: acc )
405664405657
| _ ->
405665405658
Bs_syntaxerr.err ptyp_loc Invalid_bs_int_type
405666405659
) in
@@ -405710,22 +405703,22 @@ let map_row_fields_into_strings ptyp_loc
405710405703
Ext_list.fold_right row_fields (`Nothing, []) (fun tag (nullary, acc) ->
405711405704
match nullary, tag with
405712405705
| (`Nothing | `Null),
405713-
Rtag (label, attrs, true, [])
405706+
Rtag ({txt}, attrs, true, [])
405714405707
->
405715405708
let name =
405716405709
match Ast_attributes.iter_process_bs_string_as attrs with
405717405710
| Some name ->
405718405711
has_bs_as := true; name
405719-
| None -> label.txt
405720-
in `Null, (label.txt, name) :: acc
405721-
| (`Nothing | `NonNull), Rtag(label, attrs, false, ([ _ ]))
405712+
| None -> txt
405713+
in `Null, (txt, name) :: acc
405714+
| (`Nothing | `NonNull), Rtag({txt}, attrs, false, ([ _ ]))
405722405715
->
405723405716
let name =
405724405717
match Ast_attributes.iter_process_bs_string_as attrs with
405725405718
| Some name ->
405726405719
has_bs_as := true; name
405727-
| None -> label.txt
405728-
in `NonNull, (label.txt, name) :: acc
405720+
| None -> txt
405721+
in `NonNull, (txt, name) :: acc
405729405722
| _ -> Bs_syntaxerr.err ptyp_loc Invalid_bs_string_type
405730405723

405731405724
) in
@@ -406048,16 +406041,17 @@ let init () =
406048406041
| Some row_fields ->
406049406042
let expConstantArray =
406050406043
Exp.ident {loc; txt = Longident.Lident constantArray} in
406044+
(* let has_bs_as = ref false in *)
406051406045
let result : _ list =
406052406046
Ext_list.map row_fields (fun tag ->
406053406047
match tag with
406054-
| Rtag (label, attrs, _, []) ->
406055-
(Ast_compatible.hash_label label,
406048+
| Rtag ({txt}, attrs, _, []) ->
406049+
(txt,
406056406050
match Ast_attributes.iter_process_bs_string_as_ast attrs with
406057406051
| Some name ->
406058406052
name
406059406053
| None ->
406060-
Ast_compatible.const_exp_string(Ast_compatible.label_of_name label)
406054+
Ast_compatible.const_exp_string txt
406061406055
)
406062406056
| _ -> assert false (* checked by [is_enum_polyvar] *)
406063406057
) in

‎lib/4.06.1/unstable/native_ppx.ml

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9304,9 +9304,6 @@ type object_field =
93049304
val object_field : Asttypes.label Asttypes.loc -> attributes -> core_type -> object_field
93059305

93069306

9307-
val hash_label : poly_var_label -> hash_label
9308-
9309-
val label_of_name : poly_var_label -> string
93109307

93119308
type args =
93129309
(Asttypes.arg_label * Parsetree.expression) list
@@ -9588,8 +9585,6 @@ let object_field l attrs ty =
95889585

95899586

95909587

9591-
let hash_label (x : poly_var_label) : hash_label = x.txt
9592-
let label_of_name (x : poly_var_label) : string = x.txt
95939588

95949589
type args =
95959590
(Asttypes.arg_label * Parsetree.expression) list
@@ -17515,16 +17510,14 @@ let map_row_fields_into_ints ptyp_loc
1751517510
Ext_list.fold_left row_fields (0, [])
1751617511
(fun (i,acc) rtag ->
1751717512
match rtag with
17518-
| Rtag (label, attrs, true, [])
17513+
| Rtag ({txt}, attrs, true, [])
1751917514
->
17520-
begin match Ast_attributes.iter_process_bs_int_as attrs with
17521-
| Some i ->
17522-
i + 1,
17523-
((Ast_compatible.hash_label label , i):: acc )
17524-
| None ->
17525-
i + 1 ,
17526-
((Ast_compatible.hash_label label , i):: acc )
17527-
end
17515+
let i =
17516+
match Ast_attributes.iter_process_bs_int_as attrs with
17517+
| Some i -> i | None -> i
17518+
in
17519+
i + 1,
17520+
((txt , i):: acc )
1752817521
| _ ->
1752917522
Bs_syntaxerr.err ptyp_loc Invalid_bs_int_type
1753017523
) in
@@ -17574,22 +17567,22 @@ let map_row_fields_into_strings ptyp_loc
1757417567
Ext_list.fold_right row_fields (`Nothing, []) (fun tag (nullary, acc) ->
1757517568
match nullary, tag with
1757617569
| (`Nothing | `Null),
17577-
Rtag (label, attrs, true, [])
17570+
Rtag ({txt}, attrs, true, [])
1757817571
->
1757917572
let name =
1758017573
match Ast_attributes.iter_process_bs_string_as attrs with
1758117574
| Some name ->
1758217575
has_bs_as := true; name
17583-
| None -> label.txt
17584-
in `Null, (label.txt, name) :: acc
17585-
| (`Nothing | `NonNull), Rtag(label, attrs, false, ([ _ ]))
17576+
| None -> txt
17577+
in `Null, (txt, name) :: acc
17578+
| (`Nothing | `NonNull), Rtag({txt}, attrs, false, ([ _ ]))
1758617579
->
1758717580
let name =
1758817581
match Ast_attributes.iter_process_bs_string_as attrs with
1758917582
| Some name ->
1759017583
has_bs_as := true; name
17591-
| None -> label.txt
17592-
in `NonNull, (label.txt, name) :: acc
17584+
| None -> txt
17585+
in `NonNull, (txt, name) :: acc
1759317586
| _ -> Bs_syntaxerr.err ptyp_loc Invalid_bs_string_type
1759417587

1759517588
) in

‎lib/4.06.1/whole_compiler.ml

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -290366,9 +290366,6 @@ type object_field =
290366290366
val object_field : Asttypes.label Asttypes.loc -> attributes -> core_type -> object_field
290367290367

290368290368

290369-
val hash_label : poly_var_label -> hash_label
290370-
290371-
val label_of_name : poly_var_label -> string
290372290369

290373290370
type args =
290374290371
(Asttypes.arg_label * Parsetree.expression) list
@@ -290650,8 +290647,6 @@ let object_field l attrs ty =
290650290647

290651290648

290652290649

290653-
let hash_label (x : poly_var_label) : hash_label = x.txt
290654-
let label_of_name (x : poly_var_label) : string = x.txt
290655290650

290656290651
type args =
290657290652
(Asttypes.arg_label * Parsetree.expression) list
@@ -408199,16 +408194,14 @@ let map_row_fields_into_ints ptyp_loc
408199408194
Ext_list.fold_left row_fields (0, [])
408200408195
(fun (i,acc) rtag ->
408201408196
match rtag with
408202-
| Rtag (label, attrs, true, [])
408197+
| Rtag ({txt}, attrs, true, [])
408203408198
->
408204-
begin match Ast_attributes.iter_process_bs_int_as attrs with
408205-
| Some i ->
408206-
i + 1,
408207-
((Ast_compatible.hash_label label , i):: acc )
408208-
| None ->
408209-
i + 1 ,
408210-
((Ast_compatible.hash_label label , i):: acc )
408211-
end
408199+
let i =
408200+
match Ast_attributes.iter_process_bs_int_as attrs with
408201+
| Some i -> i | None -> i
408202+
in
408203+
i + 1,
408204+
((txt , i):: acc )
408212408205
| _ ->
408213408206
Bs_syntaxerr.err ptyp_loc Invalid_bs_int_type
408214408207
) in
@@ -408258,22 +408251,22 @@ let map_row_fields_into_strings ptyp_loc
408258408251
Ext_list.fold_right row_fields (`Nothing, []) (fun tag (nullary, acc) ->
408259408252
match nullary, tag with
408260408253
| (`Nothing | `Null),
408261-
Rtag (label, attrs, true, [])
408254+
Rtag ({txt}, attrs, true, [])
408262408255
->
408263408256
let name =
408264408257
match Ast_attributes.iter_process_bs_string_as attrs with
408265408258
| Some name ->
408266408259
has_bs_as := true; name
408267-
| None -> label.txt
408268-
in `Null, (label.txt, name) :: acc
408269-
| (`Nothing | `NonNull), Rtag(label, attrs, false, ([ _ ]))
408260+
| None -> txt
408261+
in `Null, (txt, name) :: acc
408262+
| (`Nothing | `NonNull), Rtag({txt}, attrs, false, ([ _ ]))
408270408263
->
408271408264
let name =
408272408265
match Ast_attributes.iter_process_bs_string_as attrs with
408273408266
| Some name ->
408274408267
has_bs_as := true; name
408275-
| None -> label.txt
408276-
in `NonNull, (label.txt, name) :: acc
408268+
| None -> txt
408269+
in `NonNull, (txt, name) :: acc
408277408270
| _ -> Bs_syntaxerr.err ptyp_loc Invalid_bs_string_type
408278408271

408279408272
) in
@@ -408596,16 +408589,17 @@ let init () =
408596408589
| Some row_fields ->
408597408590
let expConstantArray =
408598408591
Exp.ident {loc; txt = Longident.Lident constantArray} in
408592+
(* let has_bs_as = ref false in *)
408599408593
let result : _ list =
408600408594
Ext_list.map row_fields (fun tag ->
408601408595
match tag with
408602-
| Rtag (label, attrs, _, []) ->
408603-
(Ast_compatible.hash_label label,
408596+
| Rtag ({txt}, attrs, _, []) ->
408597+
(txt,
408604408598
match Ast_attributes.iter_process_bs_string_as_ast attrs with
408605408599
| Some name ->
408606408600
name
408607408601
| None ->
408608-
Ast_compatible.const_exp_string(Ast_compatible.label_of_name label)
408602+
Ast_compatible.const_exp_string txt
408609408603
)
408610408604
| _ -> assert false (* checked by [is_enum_polyvar] *)
408611408605
) in

0 commit comments

Comments
 (0)