more tests

Author: bobzhang

jscomp/syntax/ast_tuple_pattern_flatten.ml

@@ -34,7 +34,7 @@ type whole =
       (Asttypes.override_flag * Longident.t Asttypes.loc * loc *
        Parsetree.attributes)
 
-type acc = whole list
+type wholes = whole list
 
 let rec is_simple_pattern (p : Parsetree.pattern) =
   match p.ppat_desc with
@@ -43,14 +43,17 @@ let rec is_simple_pattern (p : Parsetree.pattern) =
   | Ppat_constraint(p,_) -> is_simple_pattern p
   | _ -> false
 
+type destruct_output =
+  exp list
+  
 (**
    destruct such pattern
    {[ A.B.let open C in (a,b)]}
 *)
 let rec destruct_open_tuple
     (e : Parsetree.expression)
     (acc : whole list)
-  : (_ * Parsetree.expression list * _) option =
+  : (wholes * destruct_output * _) option =
   match e.pexp_desc with
   | Pexp_open (flag, lid, cont)
     ->

jscomp/test/pipe_syntax.js

@@ -40,11 +40,12 @@ function f2(a, b, c, d) {
   return u + v | 0;
 }
 
-function f3(a, b, c, d) {
+function f3(a, b, c, d, e) {
   var __ocaml_internal_obj = Curry._1(a, b);
-  var u = Curry._1(c, __ocaml_internal_obj);
-  var v = Curry._1(d, __ocaml_internal_obj);
-  return u + v | 0;
+  var u = Curry._2(c, __ocaml_internal_obj, d);
+  var v = Curry._3(d, __ocaml_internal_obj, 1, 2);
+  var h = Curry._1(e, __ocaml_internal_obj);
+  return (u + v | 0) + h | 0;
 }
 
 function f4(a, b, c) {
@@ -54,6 +55,13 @@ function f4(a, b, c) {
         ];
 }
 
+function f5(a, b, c, d) {
+  var v0 = Curry._3(b, a, c, c);
+  var v1 = Curry._3(b, a, c, c);
+  var v2 = Curry._3(b, a, d, d);
+  return (v0 + v1 | 0) + v2 | 0;
+}
+
 exports.t0 = t0;
 exports.t1 = t1;
 exports.t2 = t2;
@@ -63,4 +71,5 @@ exports.f1 = f1;
 exports.f2 = f2;
 exports.f3 = f3;
 exports.f4 = f4;
+exports.f5 = f5;
 /* No side effect */

jscomp/test/pipe_syntax.ml

@@ -34,10 +34,17 @@ let f2 a b c d =
   let u,v = (a b) |. (c,d) in
   u + v
 
-let f3 a b c d =
+let f3 a b c d e =
   ( a b)
-  |. (c, d)
-  |. (fun (u,v) -> u + v)
+  |. (c d, d 1 2, e)
+  |. (fun (u,v,h) -> u + v + h)
 
 let f4 a b  c =
    a |. (b c , b c )
+
+let f5 a b c d =
+  let v0, v1, v2 =
+  a
+  |. (b c c, b c c, b d d) in
+  v0 + v1 + v2 
+

lib/bsdep.ml

@@ -35932,7 +35932,7 @@ type whole =
       (Asttypes.override_flag * Longident.t Asttypes.loc * loc *
        Parsetree.attributes)
 
-type acc = whole list
+type wholes = whole list
 
 let rec is_simple_pattern (p : Parsetree.pattern) =
   match p.ppat_desc with
@@ -35941,14 +35941,17 @@ let rec is_simple_pattern (p : Parsetree.pattern) =
   | Ppat_constraint(p,_) -> is_simple_pattern p
   | _ -> false
 
+type destruct_output =
+  exp list
+  
 (**
    destruct such pattern
    {[ A.B.let open C in (a,b)]}
 *)
 let rec destruct_open_tuple
     (e : Parsetree.expression)
     (acc : whole list)
-  : (_ * Parsetree.expression list * _) option =
+  : (wholes * destruct_output * _) option =
   match e.pexp_desc with
   | Pexp_open (flag, lid, cont)
     ->

lib/bsppx.ml

@@ -17937,7 +17937,7 @@ type whole =
       (Asttypes.override_flag * Longident.t Asttypes.loc * loc *
        Parsetree.attributes)
 
-type acc = whole list
+type wholes = whole list
 
 let rec is_simple_pattern (p : Parsetree.pattern) =
   match p.ppat_desc with
@@ -17946,14 +17946,17 @@ let rec is_simple_pattern (p : Parsetree.pattern) =
   | Ppat_constraint(p,_) -> is_simple_pattern p
   | _ -> false
 
+type destruct_output =
+  exp list
+  
 (**
    destruct such pattern
    {[ A.B.let open C in (a,b)]}
 *)
 let rec destruct_open_tuple
     (e : Parsetree.expression)
     (acc : whole list)
-  : (_ * Parsetree.expression list * _) option =
+  : (wholes * destruct_output * _) option =
   match e.pexp_desc with
   | Pexp_open (flag, lid, cont)
     ->

lib/whole_compiler.ml

@@ -110481,7 +110481,7 @@ type whole =
       (Asttypes.override_flag * Longident.t Asttypes.loc * loc *
        Parsetree.attributes)
 
-type acc = whole list
+type wholes = whole list
 
 let rec is_simple_pattern (p : Parsetree.pattern) =
   match p.ppat_desc with
@@ -110490,14 +110490,17 @@ let rec is_simple_pattern (p : Parsetree.pattern) =
   | Ppat_constraint(p,_) -> is_simple_pattern p
   | _ -> false
 
+type destruct_output =
+  exp list
+  
 (**
    destruct such pattern
    {[ A.B.let open C in (a,b)]}
 *)
 let rec destruct_open_tuple
     (e : Parsetree.expression)
     (acc : whole list)
-  : (_ * Parsetree.expression list * _) option =
+  : (wholes * destruct_output * _) option =
   match e.pexp_desc with
   | Pexp_open (flag, lid, cont)
     ->