Skip to content

Commit 3ec70a5

Browse files
cristianoccristianoc
committed
Rename Record_object to Record_optional.
1 parent e214f4c commit 3ec70a5

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed

‎jscomp/core/js_dump.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ and expression_desc cxt ~(level : int) f x : cxt =
718718
| Record_regular ->
719719
expression_desc cxt ~level f
720720
(Object (Ext_list.combine_array fields el (fun i -> Js_op.Lit i)))
721-
| Record_object ->
721+
| Record_optional ->
722722
let fields =
723723
Ext_list.array_list_filter_map fields el (fun f x ->
724724
match x.expression_desc with

‎jscomp/ml/lambda.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ type loc_kind =
3535
| Loc_POS
3636

3737
type record_repr =
38-
| Record_regular
39-
| Record_object
38+
| Record_regular
39+
| Record_optional
4040

4141
type tag_info =
4242
| Blk_constructor of {name : string ; num_nonconst : int ; tag : int }

‎jscomp/ml/lambda.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type loc_kind =
3636

3737
type record_repr =
3838
| Record_regular
39-
| Record_object
39+
| Record_optional
4040

4141
type tag_info =
4242
| Blk_constructor of {name : string ; num_nonconst : int; tag : int}

‎jscomp/ml/translcore.ml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,7 @@ and transl_record loc env fields repres opt_init_expr =
11331133
| Record_float_unused -> assert false
11341134
| Record_optional_labels _ ->
11351135
Lconst
1136-
(Const_block (!Lambda.blk_record fields mut Record_object, cl))
1136+
(Const_block (!Lambda.blk_record fields mut Record_optional, cl))
11371137
| Record_regular ->
11381138
Lconst
11391139
(Const_block (!Lambda.blk_record fields mut Record_regular, cl))
@@ -1153,12 +1153,12 @@ and transl_record loc env fields repres opt_init_expr =
11531153
( Pmakeblock (!Lambda.blk_record fields mut Record_regular),
11541154
ll,
11551155
loc )
1156-
| Record_float_unused -> assert false
11571156
| Record_optional_labels _ ->
11581157
Lprim
1159-
( Pmakeblock (!Lambda.blk_record fields mut Record_object),
1158+
( Pmakeblock (!Lambda.blk_record fields mut Record_optional),
11601159
ll,
11611160
loc )
1161+
| Record_float_unused -> assert false
11621162
| Record_inlined { tag; name; num_nonconsts } ->
11631163
Lprim
11641164
( Pmakeblock

‎lib/4.06.1/unstable/js_compiler.ml

+7-7
Original file line numberDiff line numberDiff line change
@@ -23713,7 +23713,7 @@ type loc_kind =
2371323713

2371423714
type record_repr =
2371523715
| Record_regular
23716-
| Record_object
23716+
| Record_optional
2371723717

2371823718
type tag_info =
2371923719
| Blk_constructor of {name : string ; num_nonconst : int; tag : int}
@@ -24107,8 +24107,8 @@ type loc_kind =
2410724107
| Loc_POS
2410824108

2410924109
type record_repr =
24110-
| Record_regular
24111-
| Record_object
24110+
| Record_regular
24111+
| Record_optional
2411224112

2411324113
type tag_info =
2411424114
| Blk_constructor of {name : string ; num_nonconst : int ; tag : int }
@@ -69892,7 +69892,7 @@ and expression_desc cxt ~(level : int) f x : cxt =
6989269892
| Record_regular ->
6989369893
expression_desc cxt ~level f
6989469894
(Object (Ext_list.combine_array fields el (fun i -> Js_op.Lit i)))
69895-
| Record_object ->
69895+
| Record_optional ->
6989669896
let fields =
6989769897
Ext_list.array_list_filter_map fields el (fun f x ->
6989869898
match x.expression_desc with
@@ -270157,7 +270157,7 @@ and transl_record loc env fields repres opt_init_expr =
270157270157
| Record_float_unused -> assert false
270158270158
| Record_optional_labels _ ->
270159270159
Lconst
270160-
(Const_block (!Lambda.blk_record fields mut Record_object, cl))
270160+
(Const_block (!Lambda.blk_record fields mut Record_optional, cl))
270161270161
| Record_regular ->
270162270162
Lconst
270163270163
(Const_block (!Lambda.blk_record fields mut Record_regular, cl))
@@ -270177,12 +270177,12 @@ and transl_record loc env fields repres opt_init_expr =
270177270177
( Pmakeblock (!Lambda.blk_record fields mut Record_regular),
270178270178
ll,
270179270179
loc )
270180-
| Record_float_unused -> assert false
270181270180
| Record_optional_labels _ ->
270182270181
Lprim
270183-
( Pmakeblock (!Lambda.blk_record fields mut Record_object),
270182+
( Pmakeblock (!Lambda.blk_record fields mut Record_optional),
270184270183
ll,
270185270184
loc )
270185+
| Record_float_unused -> assert false
270186270186
| Record_inlined { tag; name; num_nonconsts } ->
270187270187
Lprim
270188270188
( Pmakeblock

‎lib/4.06.1/unstable/js_playground_compiler.ml

+7-7
Original file line numberDiff line numberDiff line change
@@ -23713,7 +23713,7 @@ type loc_kind =
2371323713

2371423714
type record_repr =
2371523715
| Record_regular
23716-
| Record_object
23716+
| Record_optional
2371723717

2371823718
type tag_info =
2371923719
| Blk_constructor of {name : string ; num_nonconst : int; tag : int}
@@ -24107,8 +24107,8 @@ type loc_kind =
2410724107
| Loc_POS
2410824108

2410924109
type record_repr =
24110-
| Record_regular
24111-
| Record_object
24110+
| Record_regular
24111+
| Record_optional
2411224112

2411324113
type tag_info =
2411424114
| Blk_constructor of {name : string ; num_nonconst : int ; tag : int }
@@ -69892,7 +69892,7 @@ and expression_desc cxt ~(level : int) f x : cxt =
6989269892
| Record_regular ->
6989369893
expression_desc cxt ~level f
6989469894
(Object (Ext_list.combine_array fields el (fun i -> Js_op.Lit i)))
69895-
| Record_object ->
69895+
| Record_optional ->
6989669896
let fields =
6989769897
Ext_list.array_list_filter_map fields el (fun f x ->
6989869898
match x.expression_desc with
@@ -291039,7 +291039,7 @@ and transl_record loc env fields repres opt_init_expr =
291039291039
| Record_float_unused -> assert false
291040291040
| Record_optional_labels _ ->
291041291041
Lconst
291042-
(Const_block (!Lambda.blk_record fields mut Record_object, cl))
291042+
(Const_block (!Lambda.blk_record fields mut Record_optional, cl))
291043291043
| Record_regular ->
291044291044
Lconst
291045291045
(Const_block (!Lambda.blk_record fields mut Record_regular, cl))
@@ -291059,12 +291059,12 @@ and transl_record loc env fields repres opt_init_expr =
291059291059
( Pmakeblock (!Lambda.blk_record fields mut Record_regular),
291060291060
ll,
291061291061
loc )
291062-
| Record_float_unused -> assert false
291063291062
| Record_optional_labels _ ->
291064291063
Lprim
291065-
( Pmakeblock (!Lambda.blk_record fields mut Record_object),
291064+
( Pmakeblock (!Lambda.blk_record fields mut Record_optional),
291066291065
ll,
291067291066
loc )
291067+
| Record_float_unused -> assert false
291068291068
| Record_inlined { tag; name; num_nonconsts } ->
291069291069
Lprim
291070291070
( Pmakeblock

‎lib/4.06.1/whole_compiler.ml

+7-7
Original file line numberDiff line numberDiff line change
@@ -161926,7 +161926,7 @@ type loc_kind =
161926161926

161927161927
type record_repr =
161928161928
| Record_regular
161929-
| Record_object
161929+
| Record_optional
161930161930

161931161931
type tag_info =
161932161932
| Blk_constructor of {name : string ; num_nonconst : int; tag : int}
@@ -162320,8 +162320,8 @@ type loc_kind =
162320162320
| Loc_POS
162321162321

162322162322
type record_repr =
162323-
| Record_regular
162324-
| Record_object
162323+
| Record_regular
162324+
| Record_optional
162325162325

162326162326
type tag_info =
162327162327
| Blk_constructor of {name : string ; num_nonconst : int ; tag : int }
@@ -238060,7 +238060,7 @@ and expression_desc cxt ~(level : int) f x : cxt =
238060238060
| Record_regular ->
238061238061
expression_desc cxt ~level f
238062238062
(Object (Ext_list.combine_array fields el (fun i -> Js_op.Lit i)))
238063-
| Record_object ->
238063+
| Record_optional ->
238064238064
let fields =
238065238065
Ext_list.array_list_filter_map fields el (fun f x ->
238066238066
match x.expression_desc with
@@ -273286,7 +273286,7 @@ and transl_record loc env fields repres opt_init_expr =
273286273286
| Record_float_unused -> assert false
273287273287
| Record_optional_labels _ ->
273288273288
Lconst
273289-
(Const_block (!Lambda.blk_record fields mut Record_object, cl))
273289+
(Const_block (!Lambda.blk_record fields mut Record_optional, cl))
273290273290
| Record_regular ->
273291273291
Lconst
273292273292
(Const_block (!Lambda.blk_record fields mut Record_regular, cl))
@@ -273306,12 +273306,12 @@ and transl_record loc env fields repres opt_init_expr =
273306273306
( Pmakeblock (!Lambda.blk_record fields mut Record_regular),
273307273307
ll,
273308273308
loc )
273309-
| Record_float_unused -> assert false
273310273309
| Record_optional_labels _ ->
273311273310
Lprim
273312-
( Pmakeblock (!Lambda.blk_record fields mut Record_object),
273311+
( Pmakeblock (!Lambda.blk_record fields mut Record_optional),
273313273312
ll,
273314273313
loc )
273314+
| Record_float_unused -> assert false
273315273315
| Record_inlined { tag; name; num_nonconsts } ->
273316273316
Lprim
273317273317
( Pmakeblock

0 commit comments

Comments
 (0)