Remove @res.partial entirely.

Author: cristianoc

compiler/ml/ast_mapper_from0.ml

@@ -310,7 +310,18 @@ module E = struct
         (sub.pat sub p) (sub.expr sub e)
     | Pexp_function _ -> assert false
     | Pexp_apply (e, l) ->
-      apply ~loc ~attrs (sub.expr sub e) (List.map (map_snd (sub.expr sub)) l)
+      let process_partial_app_attribute attrs =
+        let rec process partial_app acc attrs =
+          match attrs with
+          | [] -> (partial_app, List.rev acc)
+          | ({Location.txt = "res.partial"}, _) :: rest -> process true acc rest
+          | attr :: rest -> process partial_app (attr :: acc) rest
+        in
+        process false [] attrs
+      in
+      let partial, attrs = process_partial_app_attribute attrs in
+      apply ~loc ~attrs ~partial (sub.expr sub e)
+        (List.map (map_snd (sub.expr sub)) l)
     | Pexp_match (e, pel) ->
       match_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)
     | Pexp_try (e, pel) -> try_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)

compiler/ml/ast_mapper_to0.ml

@@ -325,7 +325,11 @@ module E = struct
           ~attrs:(arity_to_attributes arity)
           (Location.mkloc (Longident.Lident "Function$") e.pexp_loc)
           (Some e))
-    | Pexp_apply {funct = e; args = l} ->
+    | Pexp_apply {funct = e; args = l; partial} ->
+      let attrs =
+        if partial then (Location.mknoloc "res.partial", Pt.PStr []) :: attrs
+        else []
+      in
       apply ~loc ~attrs (sub.expr sub e) (List.map (map_snd (sub.expr sub)) l)
     | Pexp_match (e, pel) ->
       match_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)

compiler/syntax/src/res_core.ml

@@ -3719,14 +3719,7 @@ and parse_call_expr p fun_expr =
   let apply =
     Ext_list.fold_left args fun_expr (fun call_body args ->
         let args, wrap = process_underscore_application args in
-        let res_partial_attr =
-          let loc = mk_loc start_pos p.prev_end_pos in
-          (Location.mkloc "res.partial" loc, Parsetree.PStr [])
-        in
-        let exp =
-          let attrs = if partial then [res_partial_attr] else [] in
-          Ast_helper.Exp.apply ~loc ~attrs ~partial call_body args
-        in
+        let exp = Ast_helper.Exp.apply ~loc ~partial call_body args in
         wrap exp)
   in
 

compiler/syntax/src/res_parsetree_viewer.ml

@@ -70,15 +70,6 @@ let functor_type modtype =
   in
   process [] modtype
 
-let process_partial_app_attribute attrs =
-  let rec process partial_app acc attrs =
-    match attrs with
-    | [] -> (partial_app, List.rev acc)
-    | ({Location.txt = "res.partial"}, _) :: rest -> process true acc rest
-    | attr :: rest -> process partial_app (attr :: acc) rest
-  in
-  process false [] attrs
-
 let has_await_attribute attrs =
   List.exists
     (function

compiler/syntax/src/res_parsetree_viewer.mli

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

compiler/syntax/src/res_printer.ml

@@ -4271,7 +4271,6 @@ and print_pexp_apply ~state expr cmt_tbl =
         args
     in
     let attrs = expr.pexp_attributes in
-    let _, attrs = ParsetreeViewer.process_partial_app_attribute attrs in
     let args =
       if partial then
         let dummy = Ast_helper.Exp.constant ~attrs (Ast_helper.Const.int 0) in

tests/syntax_tests/data/parsing/grammar/expressions/expected/apply.res.txt

@@ -6,4 +6,4 @@
 ;;List.reduce (fun [arity:2]acc -> fun curr -> acc + curr) 0 myList
 let unitUncurried = apply ()
 ;;call ~a:(((((a)[@res.namedArgLoc ]) : int))[@res.namedArgLoc ])
-;;((call_partial 3 ...)[@res.partial ])
+;;call_partial 3 ...

tests/syntax_tests/data/printer/expr/expected/UncurriedByDefault.res.txt

@@ -170,10 +170,9 @@ let fn = (
   provikingMultilineFormattingaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 }
 
-let partial =
-  fn(
-    ~hello=1,
-    ~moreGoesHere=1,
-    ~provikingMultilineFormattingaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=1,
-    ...
-  )
+let partial = fn(
+  ~hello=1,
+  ~moreGoesHere=1,
+  ~provikingMultilineFormattingaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=1,
+  ...
+)

tests/syntax_tests/data/printer/expr/expected/apply.res.txt

@@ -100,40 +100,34 @@ let g = f(
   c,
 )
 
-let g =
-  f(
-    a =>
-      LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(a),
-    b,
-    c,
-    ...
-  )
-
-let g =
-  f(
-    a =>
-      LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(a),
-    b,
-    c =>
-      LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(
-        d,
-        ...
-      ),
-    ...
-  )
-
-let g =
-  f(
-    a =>
-      LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(
-        a,
-        ...
-      ),
-    b,
-    c =>
-      LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(d),
-    ...
-  )
+let g = f(
+  a => LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(a),
+  b,
+  c,
+  ...
+)
+
+let g = f(
+  a => LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(a),
+  b,
+  c =>
+    LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(
+      d,
+      ...
+    ),
+  ...
+)
+
+let g = f(
+  a =>
+    LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(
+      a,
+      ...
+    ),
+  b,
+  c => LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(d),
+  ...
+)
 
 let g = f(
   a => LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(a),

tests/tests/src/arity_deopt.mjs

@@ -41,13 +41,13 @@ function f3(x) {
   return (y, z) => (x + y | 0) + z | 0;
 }
 
-eq("File \"arity_deopt.res\", line 50, characters 6-13", 6, 6);
+eq("File \"arity_deopt.res\", line 50, characters 5-12", 6, 6);
 
-eq("File \"arity_deopt.res\", line 51, characters 6-13", 6, 6);
+eq("File \"arity_deopt.res\", line 51, characters 5-12", 6, 6);
 
-eq("File \"arity_deopt.res\", line 52, characters 6-13", 6, 6);
+eq("File \"arity_deopt.res\", line 52, characters 5-12", 6, 6);
 
-eq("File \"arity_deopt.res\", line 53, characters 6-13", 6, 6);
+eq("File \"arity_deopt.res\", line 53, characters 5-12", 6, 6);
 
 Mt.from_pair_suites("Arity_deopt", suites.contents);
 

tests/tests/src/arity_deopt.res

@@ -47,9 +47,9 @@ let f3 = x => {
    So the best is never shrink functons which could change arity
 */
 let () = {
-  (eq(__LOC__, 6, ...))(f0(1, 2, 3))
-  (eq(__LOC__, 6, ...))(f1(1)(2, 3))
-  (eq(__LOC__, 6, ...))(f2(1, 2)(3))
-  (eq(__LOC__, 6, ...))(f3(1)(2, 3))
+  eq(__LOC__, 6, ...)(f0(1, 2, 3))
+  eq(__LOC__, 6, ...)(f1(1)(2, 3))
+  eq(__LOC__, 6, ...)(f2(1, 2)(3))
+  eq(__LOC__, 6, ...)(f3(1)(2, 3))
 }
 let () = Mt.from_pair_suites(__MODULE__, suites.contents)

tests/tests/src/bs_mutable_set_test.mjs

@@ -284,7 +284,7 @@ for (let i$2 = 0; i$2 <= 100000; ++i$2) {
 
 Belt_MutableSetInt.checkInvariantInternal(v$1);
 
-b("File \"bs_mutable_set_test.res\", line 168, characters 5-12", Belt_Range.every(0, 100000, i => Belt_MutableSetInt.has(v$1, i)));
+b("File \"bs_mutable_set_test.res\", line 168, characters 4-11", Belt_Range.every(0, 100000, i => Belt_MutableSetInt.has(v$1, i)));
 
 eq("File \"bs_mutable_set_test.res\", line 169, characters 5-12", Belt_MutableSetInt.size(v$1), 100001);
 

tests/tests/src/bs_mutable_set_test.res

@@ -165,7 +165,7 @@ let () = {
     N.add(v, i)
   }
   N.checkInvariantInternal(v)
-  (b(__LOC__, ...))(R.every(0, 1_00_000, i => N.has(v, i)))
+  b(__LOC__, ...)(R.every(0, 1_00_000, i => N.has(v, i)))
   eq(__LOC__, N.size(v), 1_00_001)
 }
 

tests/tests/src/gpr_2614_test.res

@@ -36,8 +36,7 @@ external a : ?low:int -> hi:int -> a
 low: a -> int option [@@return undefined_to_opt]
 lowSet : a -> int -> unit
 */
-let h0 =
-  a(~hi=2, ~low="x", ...)
+let h0 = a(~hi=2, ~low="x", ...)
 
 let h1 = a(~hi=2, ~low="x", ())
 

tests/tests/src/map_find_test.res

@@ -19,7 +19,7 @@ include (
     ) => acc->SMap.set(k, v))
     @val("console.log") external log: 'a => unit = ""
 
-    (Mt.from_pair_suites(__MODULE__, ...))(list{
+    Mt.from_pair_suites(__MODULE__, ...)(list{
       ("int", _ => Eq(IntMap.get(m, 10), Some('a'))),
       ("string", _ => Eq(SMap.get(s, "10"), Some('a'))),
     })

tests/tests/src/option_repr_test.mjs

@@ -175,7 +175,7 @@ let xs = {
   tl: /* [] */0
 };
 
-b("File \"option_repr_test.res\", line 125, characters 3-10", Belt_List.every(xs, x => x));
+b("File \"option_repr_test.res\", line 125, characters 2-9", Belt_List.every(xs, x => x));
 
 let xs_0$1 = Primitive_object.lessthan(Primitive_option.some(undefined), 3) && Primitive_object.greaterthan(3, Primitive_option.some(undefined));
 
@@ -216,7 +216,7 @@ let xs$1 = {
   tl: xs_1
 };
 
-b("File \"option_repr_test.res\", line 127, characters 3-10", Belt_List.every(xs$1, x => x));
+b("File \"option_repr_test.res\", line 127, characters 2-9", Belt_List.every(xs$1, x => x));
 
 let xs_1$1 = {
   hd: neqx(undefined, null),
@@ -237,7 +237,7 @@ let xs$2 = {
   tl: xs_1$1
 };
 
-b("File \"option_repr_test.res\", line 143, characters 3-10", Belt_List.every(xs$2, x => x));
+b("File \"option_repr_test.res\", line 143, characters 2-9", Belt_List.every(xs$2, x => x));
 
 function v(x) {
   return x;

tests/tests/src/option_repr_test.res

@@ -122,9 +122,9 @@ let neqx = (a, b) => a != b && b != a
 
 let all_true = xs => Belt.List.every(xs, x => x)
 
-(b(__LOC__, ...))(all_true(list{gtx(Some(Some(Js.null)), Some(None))}))
+b(__LOC__, ...)(all_true(list{gtx(Some(Some(Js.null)), Some(None))}))
 
-(b(__LOC__, ...))(
+b(__LOC__, ...)(
   all_true(list{
     ltx(Some(None), Some(Some(3))),
     ltx(Some(None), Some(Some(None))),
@@ -140,7 +140,7 @@ let all_true = xs => Belt.List.every(xs, x => x)
   }),
 )
 
-(b(__LOC__, ...))(
+b(__LOC__, ...)(
   all_true(list{
     eqx(None, None),
     neqx(None, Some(Js.null)),

tests/tests/src/test_string_map.res

@@ -13,12 +13,12 @@ include (
     let assertion_test = () => {
       let m = ref(StringMap.empty)
       let count = 1000000
-      (timing("building", ...))(_ =>
+      timing("building", ...)(_ =>
         for i in 0 to count {
           m := m.contents->StringMap.set(Js.Int.toString(i), Js.Int.toString(i))
         }
       )
-      (timing("querying", ...))(_ =>
+      timing("querying", ...)(_ =>
         for i in 0 to count {
           m.contents->StringMap.get(Js.Int.toString(i))->ignore
         }

tests/tools_tests/ppx/TestPpx.res

@@ -42,3 +42,6 @@ let async_foo = async (x, y) => {
   let b: promise<int> = async_succ(y)
   (await a) + (await b)
 }
+
+let add = (x, y) => x + y
+let partial_add = add(3, ...)

tests/tools_tests/src/expected/TestPpx.res.jsout

@@ -51,6 +51,14 @@ async function async_foo(x, y) {
   return await a + await b | 0;
 }
 
+function add(x, y) {
+  return x + y | 0;
+}
+
+function partial_add(extra) {
+  return 3 + extra | 0;
+}
+
 let a = "A";
 
 let b = "B";
@@ -67,4 +75,6 @@ exports.fpromise = fpromise;
 exports.Uncurried = Uncurried;
 exports.async_succ = async_succ;
 exports.async_foo = async_foo;
+exports.add = add;
+exports.partial_add = partial_add;
 /*  Not a pure module */