Skip to content

Commit da1eeff

Browse files
cristianoccristianoc
committed
Clean up pipe ppx: remove a |. M.(f b c)
The syntax `a |. M.(f b c) ` only exists in OCaml. And if one converts it to ReScript, the ppx does not apply to it. So just remove it and simplify the implementation of `->`.
1 parent 3473dd5 commit da1eeff

13 files changed

+489
-650
lines changed

‎jscomp/frontend/ast_exp_apply.ml

+44-55
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
9999
(*
100100
a |. f
101101
a |. f b c [@bs] --> f a b c [@bs]
102-
a |. M.(f b c) --> M.f a M.b M.c
103102
a |. (g |. b)
104-
a |. M.Some
105103
a |. `Variant
106104
a |. (b |. f c [@bs])
107105
*)
@@ -128,61 +126,52 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
128126
pexp_loc = e.pexp_loc;
129127
pexp_attributes = e.pexp_attributes;
130128
}
129+
| Pexp_ident _ ->
130+
{
131+
pexp_desc = Pexp_apply (fn, [ (Nolabel, new_obj_arg) ]);
132+
pexp_loc = e.pexp_loc;
133+
pexp_attributes = e.pexp_attributes;
134+
}
131135
| _ -> (
132-
match Ast_open_cxt.destruct fn [] with
133-
| ( { pexp_desc = Pexp_tuple xs; pexp_attributes = tuple_attrs },
134-
wholes ) ->
135-
Ast_open_cxt.restore_exp
136-
(bound new_obj_arg (fun bounded_obj_arg ->
137-
{
138-
pexp_desc =
139-
Pexp_tuple
140-
(Ext_list.map xs (fun fn ->
141-
match fn.pexp_desc with
142-
| Pexp_construct (ctor, None) ->
143-
{
144-
fn with
145-
pexp_desc =
146-
Pexp_construct
147-
(ctor, Some bounded_obj_arg);
148-
}
149-
| Pexp_apply (fn, args) ->
150-
Bs_ast_invariant
151-
.warn_discarded_unused_attributes
152-
fn.pexp_attributes;
153-
{
154-
Parsetree.pexp_desc =
155-
Pexp_apply
156-
( fn,
157-
(Nolabel, bounded_obj_arg)
158-
:: args );
159-
pexp_attributes = [];
160-
pexp_loc = fn.pexp_loc;
161-
}
162-
| _ ->
163-
Ast_compatible.app1 ~loc:fn.pexp_loc fn
164-
bounded_obj_arg));
165-
pexp_attributes = tuple_attrs;
166-
pexp_loc = fn.pexp_loc;
167-
}))
168-
wholes
169-
| ( { pexp_desc = Pexp_apply (e, args); pexp_attributes },
170-
(_ :: _ as wholes) ) ->
171-
let fn = Ast_open_cxt.restore_exp e wholes in
172-
let args =
173-
Ext_list.map args (fun (lab, exp) ->
174-
(lab, Ast_open_cxt.restore_exp exp wholes))
175-
in
176-
Bs_ast_invariant.warn_discarded_unused_attributes
177-
pexp_attributes;
178-
{
179-
pexp_desc = Pexp_apply (fn, (Nolabel, new_obj_arg) :: args);
180-
pexp_attributes = [];
181-
pexp_loc = loc;
182-
}
136+
match fn with
137+
| { pexp_desc = Pexp_tuple xs; pexp_attributes = tuple_attrs } ->
138+
bound new_obj_arg (fun bounded_obj_arg ->
139+
{
140+
pexp_desc =
141+
Pexp_tuple
142+
(Ext_list.map xs (fun fn ->
143+
match fn.pexp_desc with
144+
| Pexp_construct (ctor, None) ->
145+
{
146+
fn with
147+
pexp_desc =
148+
Pexp_construct
149+
(ctor, Some bounded_obj_arg);
150+
}
151+
| Pexp_apply (fn, args) ->
152+
Bs_ast_invariant
153+
.warn_discarded_unused_attributes
154+
fn.pexp_attributes;
155+
{
156+
Parsetree.pexp_desc =
157+
Pexp_apply
158+
( fn,
159+
(Nolabel, bounded_obj_arg) :: args
160+
);
161+
pexp_attributes = [];
162+
pexp_loc = fn.pexp_loc;
163+
}
164+
| _ ->
165+
Ast_compatible.app1 ~loc:fn.pexp_loc fn
166+
bounded_obj_arg));
167+
pexp_attributes = tuple_attrs;
168+
pexp_loc = fn.pexp_loc;
169+
})
183170
| _ ->
184-
Ast_compatible.app1 ~loc ~attrs:e.pexp_attributes fn
185-
new_obj_arg))
171+
{
172+
(Ast_compatible.app1 ~loc fn new_obj_arg) with
173+
pexp_attributes = e.pexp_attributes;
174+
}))
186175
| Some { op = "##"; loc; args = [ obj; rest ] } -> (
187176
(* - obj##property
188177
- obj#(method a b )

‎jscomp/frontend/ast_open_cxt.ml

-8
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ type whole =
3232
* Parsetree.attributes)
3333

3434
type t = whole list
35-
3635
type exp = Parsetree.expression
37-
3836
type destruct_output = exp list
3937

4038
(**
@@ -50,12 +48,6 @@ let rec destruct_open_tuple (e : Parsetree.expression) (acc : t) :
5048
| Pexp_tuple es -> Some (acc, es, e.pexp_attributes)
5149
| _ -> None
5250

53-
let rec destruct (e : Parsetree.expression) (acc : t) =
54-
match e.pexp_desc with
55-
| Pexp_open (flag, lid, cont) ->
56-
destruct cont (Let_open (flag, lid, e.pexp_loc, e.pexp_attributes) :: acc)
57-
| _ -> (e, acc)
58-
5951
let restore_exp (xs : Parsetree.expression) (qualifiers : t) :
6052
Parsetree.expression =
6153
Ext_list.fold_left qualifiers xs (fun x hole ->

‎jscomp/frontend/ast_open_cxt.mli

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ type t = whole list
3030

3131
val restore_exp : Parsetree.expression -> t -> Parsetree.expression
3232

33-
val destruct : Parsetree.expression -> t -> Parsetree.expression * t
34-
3533
val destruct_open_tuple :
3634
Parsetree.expression ->
3735
t ->

‎jscomp/test/build.ninja

+1-3
Large diffs are not rendered by default.

‎jscomp/test/gpr_2863_test.js

-19
This file was deleted.

‎jscomp/test/gpr_2863_test.ml

-13
This file was deleted.

‎jscomp/test/gpr_3502_test.js

-27
This file was deleted.

‎jscomp/test/gpr_3502_test.ml

-5
This file was deleted.

‎jscomp/test/pipe_syntax.js

-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

33
var Curry = require("../../lib/js/curry.js");
4-
var Belt_Array = require("../../lib/js/belt_Array.js");
54
var Caml_option = require("../../lib/js/caml_option.js");
65

76
function t0(x, f) {
@@ -80,12 +79,6 @@ function f8(a) {
8079
return Caml_option.some(Caml_option.some(a));
8180
}
8281

83-
function hi(x) {
84-
return Belt_Array.map(x, (function (x) {
85-
return x + 1 | 0;
86-
}));
87-
}
88-
8982
var with_poly = {
9083
NAME: "Foo",
9184
VAL: 1
@@ -104,6 +97,5 @@ exports.f5 = f5;
10497
exports.f6 = f6;
10598
exports.f7 = f7;
10699
exports.f8 = f8;
107-
exports.hi = hi;
108100
exports.with_poly = with_poly;
109101
/* No side effect */

‎jscomp/test/pipe_syntax.ml

-3
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,4 @@ let f7 a = a |. (Some, Some, Some)
5454

5555
let f8 a = a |. Some |. Some
5656

57-
let hi x =
58-
x |. Belt.Array.(map (fun x -> x + 1 ))
59-
6057
let with_poly = 1 |. `Foo

0 commit comments

Comments
 (0)