Add support for unary uncurried pipe in uncurried mode

In normal mode, there is syntax for unary curried pipe (`x->f`) but not for unary uncurried.
In uncurried mode, after this PR, unary uncurried pipe is supported in uncurried mode (still `x->f`).

Author: cristianoc

CHANGELOG.md

@@ -16,6 +16,7 @@
 
 - Introduce experimental uncurried by default mode. Can be turned on mid-file by adding standalone annotation `@@uncurried`. For experimentation only. https://github.com/rescript-lang/rescript-compiler/pull/5796
 - Adding `@@toUncurried` to the file and reformat will convert to uncurried syntax https://github.com/rescript-lang/rescript-compiler/pull/5800
+- Add support for unary uncurried pipe in uncurried mode
 
 #### :boom: Breaking Change
 

jscomp/frontend/ast_exp_apply.ml

@@ -70,7 +70,7 @@ let view_as_app (fn : exp) (s : string list) : app_pattern option =
   | _ -> None
 
 let inner_ops = [ "##"; "#@" ]
-let infix_ops = [ "|."; "#="; "##" ]
+let infix_ops = [ "|."; "|.u"; "#="; "##" ]
 
 let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
     (args : Ast_compatible.args) : exp =
@@ -95,7 +95,7 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
       Location.raise_errorf ~loc "%s expect f%sproperty arg0 arg2 form" op op
   | None -> (
       match view_as_app e infix_ops with
-      | Some { op = "|."; args = [ a_; f_ ]; loc } -> (
+      | Some { op = ("|." | "|.u") as op; args = [ a_; f_ ]; loc } -> (
           (*
         a |. f
         a |. f b c [@bs]  --> f a b c [@bs]
@@ -178,6 +178,16 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
                     pexp_loc = e.pexp_loc;
                     pexp_attributes = e.pexp_attributes @ other_attributes;
                   }
+              | _ when op = "|.u" ->
+                  (* a |.u f
+                     Uncurried unary application *)
+                  {
+                    pexp_desc =
+                      Ast_uncurry_apply.uncurry_fn_apply e.pexp_loc self f
+                        [ (Nolabel, a) ];
+                    pexp_loc = e.pexp_loc;
+                    pexp_attributes = e.pexp_attributes;
+                  }
               | _ -> Ast_compatible.app1 ~loc ~attrs:e.pexp_attributes f a))
       | Some { op = "##"; loc; args = [ obj; rest ] } -> (
           (* - obj##property

jscomp/test/uncurried_pipe.js

@@ -17,13 +17,18 @@ var v27 = add(20, 7);
 
 var v37 = 30 + add(3, 4) | 0;
 
+function unary(x) {
+  return x + 1 | 0;
+}
+
 var StandardNotation = {
   add: add,
   addC: addC,
   v7: v7,
   v17: v17,
   v27: v27,
-  v37: v37
+  v37: v37,
+  unary: unary
 };
 
 var v7$1 = add(3, 4);
@@ -34,9 +39,12 @@ var v27$1 = add(20, 7);
 
 var v37$1 = 30 + add(3, 4) | 0;
 
+var v100 = unary(99);
+
 exports.StandardNotation = StandardNotation;
 exports.v7 = v7$1;
 exports.v17 = v17$1;
 exports.v27 = v27$1;
 exports.v37 = v37$1;
+exports.v100 = v100;
 /* v7 Not a pure module */

jscomp/test/uncurried_pipe.res

@@ -6,6 +6,8 @@ module StandardNotation = {
   let v17 = 10->add(. 3->add(. 4))
   let v27 = 20->add(. 3->addC(4))
   let v37 = 30->addC(3->add(. 4))
+
+  let unary = (. x) => x + 1
 }
 
 @@uncurried
@@ -16,3 +18,5 @@ let v7 = 3->add(4)
 let v17 = 10->add(3->add(4))
 let v27 = 20->add(3->addC(. 4))
 let v37 = 30->addC(. 3->add(4))
+
+let v100 = 99->unary

lib/4.06.1/unstable/js_compiler.ml

@@ -150303,7 +150303,7 @@ let view_as_app (fn : exp) (s : string list) : app_pattern option =
   | _ -> None
 
 let inner_ops = [ "##"; "#@" ]
-let infix_ops = [ "|."; "#="; "##" ]
+let infix_ops = [ "|."; "|.u"; "#="; "##" ]
 
 let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
     (args : Ast_compatible.args) : exp =
@@ -150328,7 +150328,7 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
       Location.raise_errorf ~loc "%s expect f%sproperty arg0 arg2 form" op op
   | None -> (
       match view_as_app e infix_ops with
-      | Some { op = "|."; args = [ a_; f_ ]; loc } -> (
+      | Some { op = ("|." | "|.u") as op; args = [ a_; f_ ]; loc } -> (
           (*
         a |. f
         a |. f b c [@bs]  --> f a b c [@bs]
@@ -150411,6 +150411,16 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
                     pexp_loc = e.pexp_loc;
                     pexp_attributes = e.pexp_attributes @ other_attributes;
                   }
+              | _ when op = "|.u" ->
+                  (* a |.u f
+                     Uncurried unary application *)
+                  {
+                    pexp_desc =
+                      Ast_uncurry_apply.uncurry_fn_apply e.pexp_loc self f
+                        [ (Nolabel, a) ];
+                    pexp_loc = e.pexp_loc;
+                    pexp_attributes = e.pexp_attributes;
+                  }
               | _ -> Ast_compatible.app1 ~loc ~attrs:e.pexp_attributes f a))
       | Some { op = "##"; loc; args = [ obj; rest ] } -> (
           (* - obj##property

lib/4.06.1/unstable/js_playground_compiler.ml

@@ -150303,7 +150303,7 @@ let view_as_app (fn : exp) (s : string list) : app_pattern option =
   | _ -> None
 
 let inner_ops = [ "##"; "#@" ]
-let infix_ops = [ "|."; "#="; "##" ]
+let infix_ops = [ "|."; "|.u"; "#="; "##" ]
 
 let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
     (args : Ast_compatible.args) : exp =
@@ -150328,7 +150328,7 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
       Location.raise_errorf ~loc "%s expect f%sproperty arg0 arg2 form" op op
   | None -> (
       match view_as_app e infix_ops with
-      | Some { op = "|."; args = [ a_; f_ ]; loc } -> (
+      | Some { op = ("|." | "|.u") as op; args = [ a_; f_ ]; loc } -> (
           (*
         a |. f
         a |. f b c [@bs]  --> f a b c [@bs]
@@ -150411,6 +150411,16 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
                     pexp_loc = e.pexp_loc;
                     pexp_attributes = e.pexp_attributes @ other_attributes;
                   }
+              | _ when op = "|.u" ->
+                  (* a |.u f
+                     Uncurried unary application *)
+                  {
+                    pexp_desc =
+                      Ast_uncurry_apply.uncurry_fn_apply e.pexp_loc self f
+                        [ (Nolabel, a) ];
+                    pexp_loc = e.pexp_loc;
+                    pexp_attributes = e.pexp_attributes;
+                  }
               | _ -> Ast_compatible.app1 ~loc ~attrs:e.pexp_attributes f a))
       | Some { op = "##"; loc; args = [ obj; rest ] } -> (
           (* - obj##property
@@ -162691,7 +162701,8 @@ let buildLongident words =
 
 let makeInfixOperator p token startPos endPos =
   let stringifiedToken =
-    if token = Token.MinusGreater then "|."
+    if token = Token.MinusGreater then
+      if p.Parser.uncurried_by_default then "|.u" else "|."
     else if token = Token.PlusPlus then "^"
     else if token = Token.BangEqual then "<>"
     else if token = Token.BangEqualEqual then "!="

lib/4.06.1/whole_compiler.ml

@@ -160587,7 +160587,7 @@ let view_as_app (fn : exp) (s : string list) : app_pattern option =
   | _ -> None
 
 let inner_ops = [ "##"; "#@" ]
-let infix_ops = [ "|."; "#="; "##" ]
+let infix_ops = [ "|."; "|.u"; "#="; "##" ]
 
 let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
     (args : Ast_compatible.args) : exp =
@@ -160612,7 +160612,7 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
       Location.raise_errorf ~loc "%s expect f%sproperty arg0 arg2 form" op op
   | None -> (
       match view_as_app e infix_ops with
-      | Some { op = "|."; args = [ a_; f_ ]; loc } -> (
+      | Some { op = ("|." | "|.u") as op; args = [ a_; f_ ]; loc } -> (
           (*
         a |. f
         a |. f b c [@bs]  --> f a b c [@bs]
@@ -160695,6 +160695,16 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
                     pexp_loc = e.pexp_loc;
                     pexp_attributes = e.pexp_attributes @ other_attributes;
                   }
+              | _ when op = "|.u" ->
+                  (* a |.u f
+                     Uncurried unary application *)
+                  {
+                    pexp_desc =
+                      Ast_uncurry_apply.uncurry_fn_apply e.pexp_loc self f
+                        [ (Nolabel, a) ];
+                    pexp_loc = e.pexp_loc;
+                    pexp_attributes = e.pexp_attributes;
+                  }
               | _ -> Ast_compatible.app1 ~loc ~attrs:e.pexp_attributes f a))
       | Some { op = "##"; loc; args = [ obj; rest ] } -> (
           (* - obj##property
@@ -176123,7 +176133,8 @@ let buildLongident words =
 
 let makeInfixOperator p token startPos endPos =
   let stringifiedToken =
-    if token = Token.MinusGreater then "|."
+    if token = Token.MinusGreater then
+      if p.Parser.uncurried_by_default then "|.u" else "|."
     else if token = Token.PlusPlus then "^"
     else if token = Token.BangEqual then "<>"
     else if token = Token.BangEqualEqual then "!="

res_syntax/src/res_core.ml

@@ -378,7 +378,8 @@ let buildLongident words =
 
 let makeInfixOperator p token startPos endPos =
   let stringifiedToken =
-    if token = Token.MinusGreater then "|."
+    if token = Token.MinusGreater then
+      if p.Parser.uncurried_by_default then "|.u" else "|."
     else if token = Token.PlusPlus then "^"
     else if token = Token.BangEqual then "<>"
     else if token = Token.BangEqualEqual then "!="

res_syntax/tests/parsing/grammar/expressions/UncurriedByDefault.res

@@ -34,3 +34,5 @@ type mixTyp = (.string) => (string, string) => (.string, string, string, string)
 type bTyp = string => (. string) => int
 type cTyp2 = (.string, string) => int
 type uTyp2 = (string, string) => int
+
+let pipe1 = 3->f

res_syntax/tests/parsing/grammar/expressions/expected/UncurriedByDefault.res.txt

@@ -51,4 +51,5 @@ type nonrec mixTyp =
       Js.Fn.arity2
 type nonrec bTyp = (string -> string -> int) Js.Fn.arity1
 type nonrec cTyp2 = string -> string -> int
-type nonrec uTyp2 = (string -> string -> int) Js.Fn.arity2
+type nonrec uTyp2 = (string -> string -> int) Js.Fn.arity2
+let pipe1 = 3 |.u f