Remove use of the @res.uapp decorator from the AST.

It used to be required to identify uncurried application.
Now all applications are uncurried, so it is redundant.

Author: cristianoc

jscomp/frontend/ast_attributes.ml

@@ -85,13 +85,6 @@ let process_attributes_rev (attrs : t) : attr_kind * t =
       | "this", _ -> Bs_syntaxerr.err loc Conflict_bs_bs_this_bs_meth
       | _, _ -> (st, attr :: acc))
 
-let process_bs (attrs : t) =
-  Ext_list.fold_left attrs (false, [])
-    (fun (st, acc) (({txt; loc = _}, _) as attr) ->
-      match (txt, st) with
-      | "bs", _ -> (true, acc)
-      | _, _ -> (st, attr :: acc))
-
 let external_attrs =
   [|
     "get";
@@ -281,10 +274,6 @@ let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
   !st
 
 let locg = Location.none
-(* let bs : attr
-   =  {txt = "bs" ; loc = locg}, Ast_payload.empty *)
-
-let res_uapp : attr = ({txt = "res.uapp"; loc = locg}, Ast_payload.empty)
 
 let get : attr = ({txt = "get"; loc = locg}, Ast_payload.empty)
 

jscomp/frontend/ast_attributes.mli

@@ -33,8 +33,6 @@ type attr_kind = Nothing | Meth_callback of attr | Method of attr
 
 val process_attributes_rev : t -> attr_kind * t
 
-val process_bs : t -> bool * t
-
 val has_inline_payload : t -> attr option
 
 val has_await_payload : t -> attr option
@@ -56,9 +54,6 @@ val iter_process_bs_string_or_int_as : t -> as_const_payload option
 
 val process_derive_type : t -> derive_attr * t
 
-(* Attribute for uncurried application coming from the ReScript parser *)
-val res_uapp : attr
-
 val get : attr
 
 val get_index : attr

jscomp/frontend/ast_exp_apply.ml

@@ -73,19 +73,14 @@ let infix_ops = ["|."; "|.u"; "#="; "##"]
 
 let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) : exp =
   match view_as_app e infix_ops with
-  | Some {op = ("|." | "|.u") as op; args = [a_; f_]; loc} -> (
+  | Some {op = "|." | "|.u"; args = [a_; f_]; loc} -> (
     (*
         a |. f
         a |. f b c [@bs]  --> f a b c [@bs]
         a |. (g |. b)
         a |. `Variant
         a |. (b |. f c [@bs])
       *)
-    let add_uncurried_attr attrs =
-      if op = "|.u" && not (List.mem Ast_attributes.res_uapp attrs) then
-        Ast_attributes.res_uapp :: attrs
-      else attrs
-    in
     let a = self.expr self a_ in
     let f = self.expr self f_ in
     match f.pexp_desc with
@@ -98,8 +93,7 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) : exp =
       {
         pexp_desc = Pexp_apply (fn1, (Nolabel, a) :: args);
         pexp_loc = e.pexp_loc;
-        pexp_attributes =
-          add_uncurried_attr (e.pexp_attributes @ f.pexp_attributes);
+        pexp_attributes = e.pexp_attributes @ f.pexp_attributes;
       }
     | Pexp_tuple xs ->
       bound a (fun bounded_obj_arg ->
@@ -119,18 +113,15 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) : exp =
                        {
                          Parsetree.pexp_desc =
                            Pexp_apply (fn, (Nolabel, bounded_obj_arg) :: args);
-                         pexp_attributes = add_uncurried_attr [];
+                         pexp_attributes = [];
                          pexp_loc = fn.pexp_loc;
                        }
                      | _ ->
-                       Ast_compatible.app1 ~loc:fn.pexp_loc
-                         ~attrs:(add_uncurried_attr []) fn bounded_obj_arg));
+                       Ast_compatible.app1 ~loc:fn.pexp_loc fn bounded_obj_arg));
             pexp_attributes = f.pexp_attributes;
             pexp_loc = f.pexp_loc;
           })
-    | _ ->
-      Ast_compatible.app1 ~loc ~attrs:(add_uncurried_attr e.pexp_attributes) f a
-    )
+    | _ -> Ast_compatible.app1 ~loc ~attrs:e.pexp_attributes f a)
   | Some {op = "##"; loc; args = [obj; rest]} -> (
     (* - obj##property
        - obj#(method a b )
@@ -173,7 +164,7 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) : exp =
       let arg = self.expr self arg in
       let fn = Exp.send ~loc obj {txt = name ^ Literals.setter_suffix; loc} in
       Exp.constraint_ ~loc
-        (Exp.apply ~loc ~attrs:[Ast_attributes.res_uapp] fn [(Nolabel, arg)])
+        (Exp.apply ~loc fn [(Nolabel, arg)])
         (Ast_literal.type_unit ~loc ())
     in
     match obj.pexp_desc with

jscomp/frontend/bs_ast_invariant.ml

@@ -28,8 +28,8 @@
 *)
 let is_bs_attribute txt =
   match txt with
-  | "as" | "bs" | "config" | "ignore" | "int" | "optional" | "string"
-  | "uncurry" | "unwrap" ->
+  | "as" | "config" | "ignore" | "int" | "optional" | "string" | "uncurry"
+  | "unwrap" ->
     true
   | _ -> false
 

jscomp/ml/typecore.ml

@@ -2146,8 +2146,7 @@ and type_expect_ ?type_clash_context ?in_function ?(recarg=Rejected) env sexp ty
       wrap_trace_gadt_instances env (lower_args env []) ty;
       begin_def ();
       let uncurried =
-        Ext_list.exists sexp.pexp_attributes (fun ({txt },_) -> txt = "res.uapp")
-        && not @@ Ext_list.exists sexp.pexp_attributes (fun ({txt },_) -> txt = "res.partial")
+        not @@ Ext_list.exists sexp.pexp_attributes (fun ({txt },_) -> txt = "res.partial")
         && not @@ is_automatic_curried_application env funct in
       let type_clash_context = type_clash_context_from_function sexp sfunct in
       let (args, ty_res, fully_applied) = type_application ?type_clash_context uncurried env funct sargs in

jscomp/syntax/src/res_core.ml

@@ -153,7 +153,6 @@ module InExternal = struct
 end
 
 let jsx_attr = (Location.mknoloc "JSX", Parsetree.PStr [])
-let uncurried_app_attr = (Location.mknoloc "res.uapp", Parsetree.PStr [])
 let ternary_attr = (Location.mknoloc "res.ternary", Parsetree.PStr [])
 let if_let_attr = (Location.mknoloc "res.iflet", Parsetree.PStr [])
 let optional_attr = (Location.mknoloc "res.optional", Parsetree.PStr [])
@@ -2199,8 +2198,7 @@ and parse_binary_expr ?(context = OrdinaryExpr) ?a p prec =
         match (token, b.pexp_desc) with
         | BarGreater, Pexp_apply (fun_expr, args) ->
           {b with pexp_desc = Pexp_apply (fun_expr, args @ [(Nolabel, a)])}
-        | BarGreater, _ ->
-          Ast_helper.Exp.apply ~loc ~attrs:[uncurried_app_attr] b [(Nolabel, a)]
+        | BarGreater, _ -> Ast_helper.Exp.apply ~loc b [(Nolabel, a)]
         | _ ->
           Ast_helper.Exp.apply ~loc
             (make_infix_operator p token start_pos end_pos)
@@ -3719,8 +3717,7 @@ and parse_call_expr p fun_expr =
     Ext_list.fold_left args fun_expr (fun call_body args ->
         let args, wrap = process_underscore_application args in
         let exp =
-          let attrs = [uncurried_app_attr] in
-          let attrs = if is_partial then res_partial_attr :: attrs else attrs in
+          let attrs = if is_partial then [res_partial_attr] else [] in
           Ast_helper.Exp.apply ~loc ~attrs call_body args
         in
         wrap exp)

jscomp/syntax/src/res_parsetree_viewer.ml

@@ -48,21 +48,6 @@ let functor_type modtype =
   in
   process [] modtype
 
-let process_uncurried_app_attribute attrs =
-  let rec process uncurried_app acc attrs =
-    match attrs with
-    | [] -> (uncurried_app, List.rev acc)
-    | ( {
-          Location.txt =
-            "bs" (* still support @bs to convert .ml files *) | "res.uapp";
-        },
-        _ )
-      :: rest ->
-      process true acc rest
-    | attr :: rest -> process uncurried_app (attr :: acc) rest
-  in
-  process false [] attrs
-
 let process_partial_app_attribute attrs =
   let rec process partial_app acc attrs =
     match attrs with
@@ -210,10 +195,9 @@ let filter_parsing_attrs attrs =
       match attr with
       | ( {
             Location.txt =
-              ( "bs" | "res.uapp" | "res.arity" | "res.braces" | "ns.braces"
-              | "res.iflet" | "res.namedArgLoc" | "res.optional" | "res.ternary"
-              | "res.async" | "res.await" | "res.template"
-              | "res.taggedTemplate" );
+              ( "res.arity" | "res.braces" | "ns.braces" | "res.iflet"
+              | "res.namedArgLoc" | "res.optional" | "res.ternary" | "res.async"
+              | "res.await" | "res.template" | "res.taggedTemplate" );
           },
           _ ) ->
         false
@@ -367,9 +351,8 @@ let has_attributes attrs =
       match attr with
       | ( {
             Location.txt =
-              ( "bs" | "res.uapp" | "res.arity" | "res.braces" | "ns.braces"
-              | "res.iflet" | "res.ternary" | "res.async" | "res.await"
-              | "res.template" );
+              ( "res.arity" | "res.braces" | "ns.braces" | "res.iflet"
+              | "res.ternary" | "res.async" | "res.await" | "res.template" );
           },
           _ ) ->
         false
@@ -552,9 +535,8 @@ let is_printable_attribute attr =
   match attr with
   | ( {
         Location.txt =
-          ( "bs" | "res.uapp" | "res.arity" | "res.iflet" | "res.braces"
-          | "ns.braces" | "JSX" | "res.async" | "res.await" | "res.template"
-          | "res.ternary" );
+          ( "res.arity" | "res.iflet" | "res.braces" | "ns.braces" | "JSX"
+          | "res.async" | "res.await" | "res.template" | "res.ternary" );
       },
       _ ) ->
     false

jscomp/syntax/src/res_parsetree_viewer.mli

@@ -14,9 +14,6 @@ val functor_type :
   list
   * Parsetree.module_type
 
-val process_uncurried_app_attribute :
-  Parsetree.attributes -> bool * Parsetree.attributes
-
 val process_partial_app_attribute :
   Parsetree.attributes -> bool * Parsetree.attributes
 

jscomp/syntax/src/res_printer.ml

@@ -4142,9 +4142,7 @@ and print_pexp_apply ~state expr cmt_tbl =
         (fun (lbl, arg) -> (lbl, ParsetreeViewer.rewrite_underscore_apply arg))
         args
     in
-    let _, attrs =
-      ParsetreeViewer.process_uncurried_app_attribute expr.pexp_attributes
-    in
+    let attrs = expr.pexp_attributes in
     let partial, attrs = ParsetreeViewer.process_partial_app_attribute attrs in
     let args =
       if partial then

jscomp/syntax/tests/parsing/errors/expressions/expected/array.res.txt

@@ -9,5 +9,4 @@
   Did you forget a `]` here?
 
 let xs =
-  ((x.map ((Function$ (fun key -> [|key;(predicates.(key))|]))[@res.arity 1]))
-  [@res.uapp ])
+  x.map ((Function$ (fun key -> [|key;(predicates.(key))|]))[@res.arity 1])

jscomp/syntax/tests/parsing/errors/expressions/expected/arrow.res.txt

@@ -8,8 +8,8 @@
 
   Did you forget a `,` here?
 
-;;((((Object.keys providers)[@res.uapp ]).reduce
-      ((Function$
-          (fun elements ->
-             fun providerId -> ((let x = 1 in let b = 2 in x + b)
-               [@res.braces ])))[@res.arity 2]))[@res.uapp ])
+;;(Object.keys providers).reduce
+    ((Function$
+        (fun elements ->
+           fun providerId -> ((let x = 1 in let b = 2 in x + b)
+             [@res.braces ])))[@res.arity 2])

jscomp/syntax/tests/parsing/errors/expressions/expected/block.res.txt

@@ -82,16 +82,13 @@ let findThreadByIdLinearScan =
                                   FBID.ofStringUnsafe in
                           thisId == id)
                         [@res.braces ])))[@res.arity 2]))
-           [@res.braces ][@res.uapp ])))
+           [@res.braces ])))
   [@res.arity 2])
-let x = ((loop 0 (Nil |.u ((push doc)[@res.uapp ])))
-  [@res.braces ][@res.uapp ])
+let x = ((loop 0 (Nil |.u (push doc)))[@res.braces ])
 ;;match stack with
   | Empty -> [%rescript.exprhole ]
   | Cons (doc, rest) -> ()
   | Join (doc1, doc2) ->
-      (buffer |.u ((Buffer.add_string indentation)[@res.uapp ]);
-       ((loop ())
-       [@res.uapp ]))
+      (buffer |.u (Buffer.add_string indentation); loop ())
 let pipeline =
   match scheduler with | Some -> [%rescript.exprhole ] | None -> ()

jscomp/syntax/tests/parsing/errors/expressions/expected/consecutive.res.txt

@@ -48,7 +48,5 @@ let f = ((Function$ (fun a -> fun b -> a + 3))[@res.arity 2])
 ;;b
 let f = ((Function$ (fun g -> fun h -> ((a + 3; b)[@res.braces ])))
   [@res.arity 2])
-let () = ((((sideEffect1 ())[@res.uapp ]); ((sideEffect2 ())[@res.uapp ]))
-  [@res.braces ])
-let () = ((let open Foo in let exception End  in ((x ())[@res.uapp ]))
-  [@res.braces ])
+let () = ((sideEffect1 (); sideEffect2 ())[@res.braces ])
+let () = ((let open Foo in let exception End  in x ())[@res.braces ])

jscomp/syntax/tests/parsing/errors/expressions/expected/ifLet.res.txt

@@ -35,13 +35,12 @@ switch result {
 | _ => ()
 }
 
+;;((match result with | Some x -> Js.log {js|The sky is blue|js} | _ -> ())
+  [@res.iflet ][@warning "-4"])
 ;;((match result with
-    | Some x -> ((Js.log {js|The sky is blue|js})[@res.uapp ])
-    | _ -> ())[@res.iflet ][@warning "-4"])
-;;((match result with
-    | Error x -> ((Js.log {js|The sky is red|js})[@res.uapp ])
+    | Error x -> Js.log {js|The sky is red|js}
     | _ ->
         (((match result with
-           | Ok y -> ((Js.log {js|The sky is blue|js})[@res.uapp ])
+           | Ok y -> Js.log {js|The sky is blue|js}
            | _ -> ()))
         [@res.iflet ][@warning "-4"]))[@res.iflet ][@warning "-4"])

jscomp/syntax/tests/parsing/errors/expressions/expected/letBinding.res.txt

@@ -82,7 +82,7 @@
 let foo = 2.
 let foo = true
 let foo = 2
-let foo = ((f ())[@res.uapp ])
+let foo = f ()
 let foo = ((2)[@res.braces ])
 let foo = (({js|foo|js})[@res.braces ])
 let foo as x = ()

jscomp/syntax/tests/parsing/errors/expressions/expected/record.res.txt

@@ -48,8 +48,7 @@
 
   Missing expression
 
-let newWrapper = { updateF; value = ((f xWrapper.currentValue)[@res.uapp ]) }
-let newWrapper =
-  { updateF; updateF2; value = ((f xWrapper.currentValue)[@res.uapp ]) }
+let newWrapper = { updateF; value = (f xWrapper.currentValue) }
+let newWrapper = { updateF; updateF2; value = (f xWrapper.currentValue) }
 let record = { field = ([%rescript.exprhole ]) }
 let record = { field = 2 }

jscomp/syntax/tests/parsing/errors/expressions/expected/setField.res.txt

@@ -13,4 +13,4 @@
 
 ;;if match
   then let a = 1 in (m.left).compatibleTypeArgs <- ([%rescript.exprhole ])
-  else ((sideEffect ())[@res.uapp ])
+  else sideEffect ()

jscomp/syntax/tests/parsing/errors/expressions/expected/try.res.txt

@@ -9,5 +9,4 @@
 
   Did you forget a `catch` here?
 
-let parsedPayload =
-  try ((Js.Json.parseExn response)[@res.uapp ]) with | _ -> Js.Json.null
+let parsedPayload = try Js.Json.parseExn response with | _ -> Js.Json.null

jscomp/syntax/tests/parsing/errors/other/expected/breadcrumbs170.res.txt

@@ -10,7 +10,7 @@
 
   I'm not sure what to parse here when looking at "}".
 
-let l = ((Obj.magic (Some [1; 2; 3]))[@res.uapp ])
+let l = Obj.magic (Some [1; 2; 3])
 module M = struct ;;match l with | None -> [] | Some l -> l#prop end
 ;;from
 ;;now

jscomp/syntax/tests/parsing/errors/pattern/expected/missing.res.txt

@@ -44,9 +44,5 @@
   I was expecting a pattern to match on before the `=>`
 
 let 2 = [%rescript.exprhole ]
-let 4 =
-  for [%rescript.patternhole ] = 0 to 10 do
-    ((Js.log {js|for|js})
-    [@res.uapp ])
-  done
+let 4 = for [%rescript.patternhole ] = 0 to 10 do Js.log {js|for|js} done
 ;;match x with | () -> [%rescript.exprhole ]

jscomp/syntax/tests/parsing/errors/structure/expected/gh16A.res.txt

@@ -10,8 +10,5 @@
 
   I'm not sure what to parse here when looking at ")".
 
-module C =
-  struct
-    module T = (Fun)(struct ;;((foo (a + c) (b + d))[@res.uapp ]) end)
-  end
-;;((Js.log {js|test|js})[@res.uapp ])
+module C = struct module T = (Fun)(struct ;;foo (a + c) (b + d) end) end
+;;Js.log {js|test|js}