Skip to content

Commit 39903eb

Browse files
bobzhangbobzhang
committed
clean up
1 parent 61d7892 commit 39903eb

File tree

4 files changed

+56
-60
lines changed

4 files changed

+56
-60
lines changed

‎jscomp/core/lam_compile.ml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1469,6 +1469,10 @@ and compile_prim (prim_info : Lam.prim_info) (lambda_cxt : Lam_compile_context.t
14691469
arg] (** x##name arg could be specialized as a setter *)
14701470
->
14711471
let obj = Ext_list.singleton_exn args_l in
1472+
let property =
1473+
Lam_methname.translate ~loc
1474+
(String.sub method_name 0
1475+
(String.length method_name - Literals.setter_suffix_len)) in
14721476
let need_value_no_return_cxt = {lambda_cxt with continuation = NeedValue Not_tail} in
14731477
let obj_output = compile_lambda need_value_no_return_cxt obj in
14741478
let arg_output = compile_lambda need_value_no_return_cxt arg in
@@ -1484,21 +1488,16 @@ and compile_prim (prim_info : Lam.prim_info) (lambda_cxt : Lam_compile_context.t
14841488
| {value = None}, _ | _, {value = None} -> assert false
14851489
| {block = obj_block; value = Some obj },
14861490
{block = arg_block; value = Some value}
1487-
->
1488-
1489-
let property =
1490-
Lam_methname.translate ~loc
1491-
(String.sub method_name 0
1492-
(String.length method_name - Literals.setter_suffix_len)) in
1493-
match Js_ast_util.named_expression obj with
1494-
| None ->
1495-
cont obj_block arg_block None
1496-
(E.seq (E.assign (E.dot obj property) value) E.unit)
1497-
| Some (obj_code, obj)
1498-
->
1499-
cont obj_block arg_block (Some obj_code)
1500-
(E.seq (E.assign (E.dot (E.var obj) property) value) E.unit)
1501-
)
1491+
->
1492+
match Js_ast_util.named_expression obj with
1493+
| None ->
1494+
cont obj_block arg_block None
1495+
(E.seq (E.assign (E.dot obj property) value) E.unit)
1496+
| Some (obj_code, obj)
1497+
->
1498+
cont obj_block arg_block (Some obj_code)
1499+
(E.seq (E.assign (E.dot (E.var obj) property) value) E.unit)
1500+
)
15021501
| fn :: rest ->
15031502
compile_lambda lambda_cxt
15041503
(Lam.apply fn rest

‎lib/4.06.1/unstable/js_compiler.ml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -125309,6 +125309,10 @@ and compile_prim (prim_info : Lam.prim_info) (lambda_cxt : Lam_compile_context.t
125309125309
arg] (** x##name arg could be specialized as a setter *)
125310125310
->
125311125311
let obj = Ext_list.singleton_exn args_l in
125312+
let property =
125313+
Lam_methname.translate ~loc
125314+
(String.sub method_name 0
125315+
(String.length method_name - Literals.setter_suffix_len)) in
125312125316
let need_value_no_return_cxt = {lambda_cxt with continuation = NeedValue Not_tail} in
125313125317
let obj_output = compile_lambda need_value_no_return_cxt obj in
125314125318
let arg_output = compile_lambda need_value_no_return_cxt arg in
@@ -125324,21 +125328,16 @@ and compile_prim (prim_info : Lam.prim_info) (lambda_cxt : Lam_compile_context.t
125324125328
| {value = None}, _ | _, {value = None} -> assert false
125325125329
| {block = obj_block; value = Some obj },
125326125330
{block = arg_block; value = Some value}
125327-
->
125328-
125329-
let property =
125330-
Lam_methname.translate ~loc
125331-
(String.sub method_name 0
125332-
(String.length method_name - Literals.setter_suffix_len)) in
125333-
match Js_ast_util.named_expression obj with
125334-
| None ->
125335-
cont obj_block arg_block None
125336-
(E.seq (E.assign (E.dot obj property) value) E.unit)
125337-
| Some (obj_code, obj)
125338-
->
125339-
cont obj_block arg_block (Some obj_code)
125340-
(E.seq (E.assign (E.dot (E.var obj) property) value) E.unit)
125341-
)
125331+
->
125332+
match Js_ast_util.named_expression obj with
125333+
| None ->
125334+
cont obj_block arg_block None
125335+
(E.seq (E.assign (E.dot obj property) value) E.unit)
125336+
| Some (obj_code, obj)
125337+
->
125338+
cont obj_block arg_block (Some obj_code)
125339+
(E.seq (E.assign (E.dot (E.var obj) property) value) E.unit)
125340+
)
125342125341
| fn :: rest ->
125343125342
compile_lambda lambda_cxt
125344125343
(Lam.apply fn rest

‎lib/4.06.1/unstable/js_refmt_compiler.ml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -125309,6 +125309,10 @@ and compile_prim (prim_info : Lam.prim_info) (lambda_cxt : Lam_compile_context.t
125309125309
arg] (** x##name arg could be specialized as a setter *)
125310125310
->
125311125311
let obj = Ext_list.singleton_exn args_l in
125312+
let property =
125313+
Lam_methname.translate ~loc
125314+
(String.sub method_name 0
125315+
(String.length method_name - Literals.setter_suffix_len)) in
125312125316
let need_value_no_return_cxt = {lambda_cxt with continuation = NeedValue Not_tail} in
125313125317
let obj_output = compile_lambda need_value_no_return_cxt obj in
125314125318
let arg_output = compile_lambda need_value_no_return_cxt arg in
@@ -125324,21 +125328,16 @@ and compile_prim (prim_info : Lam.prim_info) (lambda_cxt : Lam_compile_context.t
125324125328
| {value = None}, _ | _, {value = None} -> assert false
125325125329
| {block = obj_block; value = Some obj },
125326125330
{block = arg_block; value = Some value}
125327-
->
125328-
125329-
let property =
125330-
Lam_methname.translate ~loc
125331-
(String.sub method_name 0
125332-
(String.length method_name - Literals.setter_suffix_len)) in
125333-
match Js_ast_util.named_expression obj with
125334-
| None ->
125335-
cont obj_block arg_block None
125336-
(E.seq (E.assign (E.dot obj property) value) E.unit)
125337-
| Some (obj_code, obj)
125338-
->
125339-
cont obj_block arg_block (Some obj_code)
125340-
(E.seq (E.assign (E.dot (E.var obj) property) value) E.unit)
125341-
)
125331+
->
125332+
match Js_ast_util.named_expression obj with
125333+
| None ->
125334+
cont obj_block arg_block None
125335+
(E.seq (E.assign (E.dot obj property) value) E.unit)
125336+
| Some (obj_code, obj)
125337+
->
125338+
cont obj_block arg_block (Some obj_code)
125339+
(E.seq (E.assign (E.dot (E.var obj) property) value) E.unit)
125340+
)
125342125341
| fn :: rest ->
125343125342
compile_lambda lambda_cxt
125344125343
(Lam.apply fn rest

‎lib/4.06.1/whole_compiler.ml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -117147,6 +117147,10 @@ and compile_prim (prim_info : Lam.prim_info) (lambda_cxt : Lam_compile_context.t
117147117147
arg] (** x##name arg could be specialized as a setter *)
117148117148
->
117149117149
let obj = Ext_list.singleton_exn args_l in
117150+
let property =
117151+
Lam_methname.translate ~loc
117152+
(String.sub method_name 0
117153+
(String.length method_name - Literals.setter_suffix_len)) in
117150117154
let need_value_no_return_cxt = {lambda_cxt with continuation = NeedValue Not_tail} in
117151117155
let obj_output = compile_lambda need_value_no_return_cxt obj in
117152117156
let arg_output = compile_lambda need_value_no_return_cxt arg in
@@ -117162,21 +117166,16 @@ and compile_prim (prim_info : Lam.prim_info) (lambda_cxt : Lam_compile_context.t
117162117166
| {value = None}, _ | _, {value = None} -> assert false
117163117167
| {block = obj_block; value = Some obj },
117164117168
{block = arg_block; value = Some value}
117165-
->
117166-
117167-
let property =
117168-
Lam_methname.translate ~loc
117169-
(String.sub method_name 0
117170-
(String.length method_name - Literals.setter_suffix_len)) in
117171-
match Js_ast_util.named_expression obj with
117172-
| None ->
117173-
cont obj_block arg_block None
117174-
(E.seq (E.assign (E.dot obj property) value) E.unit)
117175-
| Some (obj_code, obj)
117176-
->
117177-
cont obj_block arg_block (Some obj_code)
117178-
(E.seq (E.assign (E.dot (E.var obj) property) value) E.unit)
117179-
)
117169+
->
117170+
match Js_ast_util.named_expression obj with
117171+
| None ->
117172+
cont obj_block arg_block None
117173+
(E.seq (E.assign (E.dot obj property) value) E.unit)
117174+
| Some (obj_code, obj)
117175+
->
117176+
cont obj_block arg_block (Some obj_code)
117177+
(E.seq (E.assign (E.dot (E.var obj) property) value) E.unit)
117178+
)
117180117179
| fn :: rest ->
117181117180
compile_lambda lambda_cxt
117182117181
(Lam.apply fn rest

0 commit comments

Comments
 (0)