Skip to content

Commit a8a4ea0

Browse files
bobzhangbobzhang
committed
move more to compatible layer
1 parent 0e758d2 commit a8a4ea0

File tree

8 files changed

+1299
-961
lines changed

8 files changed

+1299
-961
lines changed

‎jscomp/all.depend

Lines changed: 963 additions & 960 deletions
Large diffs are not rendered by default.

‎jscomp/bin/all_ounit_tests.ml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14352,6 +14352,29 @@ val apply_simple:
1435214352
expression list ->
1435314353
expression
1435414354

14355+
val app1:
14356+
?loc:Location.t ->
14357+
?attrs:attrs ->
14358+
expression ->
14359+
expression ->
14360+
expression
14361+
14362+
val app2:
14363+
?loc:Location.t ->
14364+
?attrs:attrs ->
14365+
expression ->
14366+
expression ->
14367+
expression ->
14368+
expression
14369+
14370+
val app3:
14371+
?loc:Location.t ->
14372+
?attrs:attrs ->
14373+
expression ->
14374+
expression ->
14375+
expression ->
14376+
expression ->
14377+
expression
1435514378

1435614379
val apply_labels:
1435714380
?loc:Location.t ->
@@ -14438,6 +14461,49 @@ let apply_simple
1443814461
fn,
1443914462
(Ext_list.map (fun x -> "",x) args) ) }
1444014463

14464+
let app1
14465+
?(loc = default_loc)
14466+
?(attrs = [])
14467+
fn arg1 : expression =
14468+
{ pexp_loc = loc;
14469+
pexp_attributes = attrs;
14470+
pexp_desc =
14471+
Pexp_apply(
14472+
fn,
14473+
["", arg1]
14474+
) }
14475+
14476+
let app2
14477+
?(loc = default_loc)
14478+
?(attrs = [])
14479+
fn arg1 arg2 : expression =
14480+
{ pexp_loc = loc;
14481+
pexp_attributes = attrs;
14482+
pexp_desc =
14483+
Pexp_apply(
14484+
fn,
14485+
[
14486+
"", arg1;
14487+
"", arg2 ]
14488+
) }
14489+
14490+
let app3
14491+
?(loc = default_loc)
14492+
?(attrs = [])
14493+
fn arg1 arg2 arg3 : expression =
14494+
{ pexp_loc = loc;
14495+
pexp_attributes = attrs;
14496+
pexp_desc =
14497+
Pexp_apply(
14498+
fn,
14499+
[
14500+
"", arg1;
14501+
"", arg2;
14502+
"", arg3
14503+
]
14504+
) }
14505+
14506+
1444114507
let apply_labels
1444214508
?(loc = default_loc)
1444314509
?(attrs = [])
@@ -14449,6 +14515,7 @@ let apply_labels
1444914515
fn,
1445014516
args ) }
1445114517

14518+
1445214519
let fun_
1445314520
?(loc = default_loc)
1445414521
?(attrs = [])

‎jscomp/syntax/ast_compatible.ml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,49 @@ let apply_simple
6969
fn,
7070
(Ext_list.map (fun x -> "",x) args) ) }
7171

72+
let app1
73+
?(loc = default_loc)
74+
?(attrs = [])
75+
fn arg1 : expression =
76+
{ pexp_loc = loc;
77+
pexp_attributes = attrs;
78+
pexp_desc =
79+
Pexp_apply(
80+
fn,
81+
["", arg1]
82+
) }
83+
84+
let app2
85+
?(loc = default_loc)
86+
?(attrs = [])
87+
fn arg1 arg2 : expression =
88+
{ pexp_loc = loc;
89+
pexp_attributes = attrs;
90+
pexp_desc =
91+
Pexp_apply(
92+
fn,
93+
[
94+
"", arg1;
95+
"", arg2 ]
96+
) }
97+
98+
let app3
99+
?(loc = default_loc)
100+
?(attrs = [])
101+
fn arg1 arg2 arg3 : expression =
102+
{ pexp_loc = loc;
103+
pexp_attributes = attrs;
104+
pexp_desc =
105+
Pexp_apply(
106+
fn,
107+
[
108+
"", arg1;
109+
"", arg2;
110+
"", arg3
111+
]
112+
) }
113+
114+
72115
let apply_labels
73116
?(loc = default_loc)
74117
?(attrs = [])
@@ -80,6 +123,7 @@ let apply_labels
80123
fn,
81124
args ) }
82125

126+
83127
let fun_
84128
?(loc = default_loc)
85129
?(attrs = [])

‎jscomp/syntax/ast_compatible.mli

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,29 @@ val apply_simple:
5252
expression list ->
5353
expression
5454

55+
val app1:
56+
?loc:Location.t ->
57+
?attrs:attrs ->
58+
expression ->
59+
expression ->
60+
expression
61+
62+
val app2:
63+
?loc:Location.t ->
64+
?attrs:attrs ->
65+
expression ->
66+
expression ->
67+
expression ->
68+
expression
69+
70+
val app3:
71+
?loc:Location.t ->
72+
?attrs:attrs ->
73+
expression ->
74+
expression ->
75+
expression ->
76+
expression ->
77+
expression
5578

5679
val apply_labels:
5780
?loc:Location.t ->

‎jscomp/syntax/ast_derive_dyn.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ let js_dyn_tuple_to_value i =
8989

9090

9191
let bs_apply1 f v =
92-
Exp.apply f ["",v] ~attrs:bs_attrs
92+
Ast_compatible.app1 f v ~attrs:bs_attrs
9393

9494

9595

‎lib/bsdep.ml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28808,6 +28808,29 @@ val apply_simple:
2880828808
expression list ->
2880928809
expression
2881028810

28811+
val app1:
28812+
?loc:Location.t ->
28813+
?attrs:attrs ->
28814+
expression ->
28815+
expression ->
28816+
expression
28817+
28818+
val app2:
28819+
?loc:Location.t ->
28820+
?attrs:attrs ->
28821+
expression ->
28822+
expression ->
28823+
expression ->
28824+
expression
28825+
28826+
val app3:
28827+
?loc:Location.t ->
28828+
?attrs:attrs ->
28829+
expression ->
28830+
expression ->
28831+
expression ->
28832+
expression ->
28833+
expression
2881128834

2881228835
val apply_labels:
2881328836
?loc:Location.t ->
@@ -28894,6 +28917,49 @@ let apply_simple
2889428917
fn,
2889528918
(Ext_list.map (fun x -> "",x) args) ) }
2889628919

28920+
let app1
28921+
?(loc = default_loc)
28922+
?(attrs = [])
28923+
fn arg1 : expression =
28924+
{ pexp_loc = loc;
28925+
pexp_attributes = attrs;
28926+
pexp_desc =
28927+
Pexp_apply(
28928+
fn,
28929+
["", arg1]
28930+
) }
28931+
28932+
let app2
28933+
?(loc = default_loc)
28934+
?(attrs = [])
28935+
fn arg1 arg2 : expression =
28936+
{ pexp_loc = loc;
28937+
pexp_attributes = attrs;
28938+
pexp_desc =
28939+
Pexp_apply(
28940+
fn,
28941+
[
28942+
"", arg1;
28943+
"", arg2 ]
28944+
) }
28945+
28946+
let app3
28947+
?(loc = default_loc)
28948+
?(attrs = [])
28949+
fn arg1 arg2 arg3 : expression =
28950+
{ pexp_loc = loc;
28951+
pexp_attributes = attrs;
28952+
pexp_desc =
28953+
Pexp_apply(
28954+
fn,
28955+
[
28956+
"", arg1;
28957+
"", arg2;
28958+
"", arg3
28959+
]
28960+
) }
28961+
28962+
2889728963
let apply_labels
2889828964
?(loc = default_loc)
2889928965
?(attrs = [])
@@ -28905,6 +28971,7 @@ let apply_labels
2890528971
fn,
2890628972
args ) }
2890728973

28974+
2890828975
let fun_
2890928976
?(loc = default_loc)
2891028977
?(attrs = [])

‎lib/bsppx.ml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10750,6 +10750,29 @@ val apply_simple:
1075010750
expression list ->
1075110751
expression
1075210752

10753+
val app1:
10754+
?loc:Location.t ->
10755+
?attrs:attrs ->
10756+
expression ->
10757+
expression ->
10758+
expression
10759+
10760+
val app2:
10761+
?loc:Location.t ->
10762+
?attrs:attrs ->
10763+
expression ->
10764+
expression ->
10765+
expression ->
10766+
expression
10767+
10768+
val app3:
10769+
?loc:Location.t ->
10770+
?attrs:attrs ->
10771+
expression ->
10772+
expression ->
10773+
expression ->
10774+
expression ->
10775+
expression
1075310776

1075410777
val apply_labels:
1075510778
?loc:Location.t ->
@@ -10836,6 +10859,49 @@ let apply_simple
1083610859
fn,
1083710860
(Ext_list.map (fun x -> "",x) args) ) }
1083810861

10862+
let app1
10863+
?(loc = default_loc)
10864+
?(attrs = [])
10865+
fn arg1 : expression =
10866+
{ pexp_loc = loc;
10867+
pexp_attributes = attrs;
10868+
pexp_desc =
10869+
Pexp_apply(
10870+
fn,
10871+
["", arg1]
10872+
) }
10873+
10874+
let app2
10875+
?(loc = default_loc)
10876+
?(attrs = [])
10877+
fn arg1 arg2 : expression =
10878+
{ pexp_loc = loc;
10879+
pexp_attributes = attrs;
10880+
pexp_desc =
10881+
Pexp_apply(
10882+
fn,
10883+
[
10884+
"", arg1;
10885+
"", arg2 ]
10886+
) }
10887+
10888+
let app3
10889+
?(loc = default_loc)
10890+
?(attrs = [])
10891+
fn arg1 arg2 arg3 : expression =
10892+
{ pexp_loc = loc;
10893+
pexp_attributes = attrs;
10894+
pexp_desc =
10895+
Pexp_apply(
10896+
fn,
10897+
[
10898+
"", arg1;
10899+
"", arg2;
10900+
"", arg3
10901+
]
10902+
) }
10903+
10904+
1083910905
let apply_labels
1084010906
?(loc = default_loc)
1084110907
?(attrs = [])
@@ -10847,6 +10913,7 @@ let apply_labels
1084710913
fn,
1084810914
args ) }
1084910915

10916+
1085010917
let fun_
1085110918
?(loc = default_loc)
1085210919
?(attrs = [])

0 commit comments

Comments
 (0)