printer

Author: cristianoc

compiler/ml/pprintast.ml

@@ -954,7 +954,7 @@ and binding ctxt f {pvb_pat=p; pvb_expr=x; _} =
       | Pexp_fun (label, eo, p, e, arity) ->
           let arity_str = match arity with
             | None -> ""
-            | Some arity -> "arity:" ^ string_of_int arity
+            | Some arity -> "[arity:" ^ string_of_int arity ^ "]"
           in
           if label=Nolabel then
             pp f "%s%a@ %a" arity_str (simple_pattern ctxt) p pp_print_pexp_function e

compiler/syntax/src/res_parens.ml

@@ -304,7 +304,7 @@ let ternary_operand expr =
       Nothing
     | {pexp_desc = Pexp_constraint _} -> Parenthesized
     | _ when Res_parsetree_viewer.is_fun_newtype expr -> (
-      let _uncurried, _attrsOnArrow, _parameters, return_expr =
+      let _attrsOnArrow, _parameters, return_expr =
         ParsetreeViewer.fun_expr expr
       in
       match return_expr.pexp_desc with

compiler/syntax/src/res_parsetree_viewer.ml

@@ -178,7 +178,7 @@ let fun_expr expr =
       collect_new_types (string_loc :: acc) return_expr
     | return_expr -> (List.rev acc, return_expr)
   in
-  let rec collect ~uncurried ~n_fun attrs_before acc expr =
+  let rec collect ~n_fun attrs_before acc expr =
     match expr with
     | {
      pexp_desc =
@@ -189,37 +189,32 @@ let fun_expr expr =
            {pexp_desc = Pexp_apply _},
            _ );
     } ->
-      (uncurried, attrs_before, List.rev acc, rewrite_underscore_apply expr)
+      (attrs_before, List.rev acc, rewrite_underscore_apply expr)
     | {pexp_desc = Pexp_newtype (string_loc, rest); pexp_attributes = attrs} ->
       let string_locs, return_expr = collect_new_types [string_loc] rest in
       let param = NewTypes {attrs; locs = string_locs} in
-      collect ~uncurried ~n_fun attrs_before (param :: acc) return_expr
+      collect ~n_fun attrs_before (param :: acc) return_expr
     | {
-     pexp_desc = Pexp_fun (lbl, default_expr, pattern, return_expr, _);
+     pexp_desc = Pexp_fun (lbl, default_expr, pattern, return_expr, arity);
      pexp_attributes = [];
-    } ->
+    }
+      when arity = None || n_fun = 0 ->
       let parameter =
         Parameter {attrs = []; lbl; default_expr; pat = pattern}
       in
-      collect ~uncurried ~n_fun:(n_fun + 1) attrs_before (parameter :: acc)
-        return_expr
+      collect ~n_fun:(n_fun + 1) attrs_before (parameter :: acc) return_expr
     (* If a fun has an attribute, then it stops here and makes currying.
        i.e attributes outside of (...), uncurried `(.)` and `async` make currying *)
-    | {pexp_desc = Pexp_fun _} -> (uncurried, attrs_before, List.rev acc, expr)
+    | {pexp_desc = Pexp_fun _} -> (attrs_before, List.rev acc, expr)
     | expr when n_fun = 0 && Ast_uncurried.expr_is_uncurried_fun expr ->
       let expr = Ast_uncurried.expr_extract_uncurried_fun expr in
-      collect ~uncurried:true ~n_fun attrs_before acc expr
-    | expr -> (uncurried, attrs_before, List.rev acc, expr)
+      collect ~n_fun attrs_before acc expr
+    | expr -> (attrs_before, List.rev acc, expr)
   in
   match expr with
   | {pexp_desc = Pexp_fun _ | Pexp_newtype _} ->
-    collect ~uncurried:false ~n_fun:0 expr.pexp_attributes []
-      {expr with pexp_attributes = []}
-  | _ when Ast_uncurried.expr_is_uncurried_fun expr ->
-    let expr = Ast_uncurried.expr_extract_uncurried_fun expr in
-    collect ~uncurried:true ~n_fun:0 expr.pexp_attributes []
-      {expr with pexp_attributes = []}
-  | _ -> collect ~uncurried:false ~n_fun:0 [] [] expr
+    collect ~n_fun:0 expr.pexp_attributes [] {expr with pexp_attributes = []}
+  | _ -> collect ~n_fun:0 [] [] expr
 
 let process_braces_attr expr =
   match expr.pexp_attributes with

compiler/syntax/src/res_parsetree_viewer.mli

@@ -61,7 +61,7 @@ type fun_param_kind =
 
 val fun_expr :
   Parsetree.expression ->
-  bool * Parsetree.attributes * fun_param_kind list * Parsetree.expression
+  Parsetree.attributes * fun_param_kind list * Parsetree.expression
 
 (* example:
    *  `makeCoordinate({

compiler/syntax/src/res_printer.ml

@@ -1988,9 +1988,7 @@ and print_value_binding ~state ~rec_flag (vb : Parsetree.value_binding) cmt_tbl
      };
    pvb_expr = {pexp_desc = Pexp_newtype _} as expr;
   } -> (
-    let _uncurried, _attrs, parameters, return_expr =
-      ParsetreeViewer.fun_expr expr
-    in
+    let _attrs, parameters, return_expr = ParsetreeViewer.fun_expr expr in
     let abstract_type =
       match parameters with
       | [NewTypes {locs = vars}] ->
@@ -2703,9 +2701,7 @@ and print_if_chain ~state pexp_attributes ifs else_expr cmt_tbl =
 
 and print_expression ~state (e : Parsetree.expression) cmt_tbl =
   let print_arrow e =
-    let _, attrs_on_arrow, parameters, return_expr =
-      ParsetreeViewer.fun_expr e
-    in
+    let attrs_on_arrow, parameters, return_expr = ParsetreeViewer.fun_expr e in
     let ParsetreeViewer.{async; attributes = attrs} =
       ParsetreeViewer.process_function_attributes attrs_on_arrow
     in
@@ -3447,7 +3443,7 @@ and print_expression ~state (e : Parsetree.expression) cmt_tbl =
   | _ -> expr_with_await
 
 and print_pexp_fun ~state ~in_callback e cmt_tbl =
-  let _, attrs_on_arrow, parameters, return_expr = ParsetreeViewer.fun_expr e in
+  let attrs_on_arrow, parameters, return_expr = ParsetreeViewer.fun_expr e in
   let ParsetreeViewer.{async; attributes = attrs} =
     ParsetreeViewer.process_function_attributes attrs_on_arrow
   in

tests/syntax_tests/data/conversion/reason/expected/fastPipe.res.txt

@@ -7,7 +7,7 @@ Element.querySelectorAll(selector, element)
 
 let x = @attr ((@attr2 a)->f(b)->c(d))
 
-5->(doStuff(3, _, 7))
+5->doStuff(3, _, 7)
 
 (event->target)["value"]
 

tests/syntax_tests/data/conversion/reason/expected/underscoreSugar.res.txt

@@ -1 +1 @@
-let photo = (Array.get(_, 0))(filterNone(pricedRoom["room"]["photos"]))
+let photo = Array.get(_, 0)(filterNone(pricedRoom["room"]["photos"]))

tests/syntax_tests/data/parsing/errors/expressions/expected/array.res.txt

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

tests/syntax_tests/data/parsing/errors/expressions/expected/arrow.res.txt

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

tests/syntax_tests/data/parsing/errors/expressions/expected/block.res.txt

@@ -63,26 +63,21 @@
 
   Looks like there might be an expression missing here
 
-let findThreadByIdLinearScan =
-  Function$
-    (fun [arity:2]~threads:((threads)[@res.namedArgLoc ]) ->
-       fun ~id:((id)[@res.namedArgLoc ]) ->
-         ((Js.Array2.findi ThreadsModel.threads
-             (Function$
-                (fun [arity:2]thread ->
-                   fun i ->
-                     ((let thisId =
-                         match thread with
-                         | ServerData.OneToOne
-                             { otherPersonIDWhichIsAlsoThreadID } ->
-                             otherPersonIDWhichIsAlsoThreadID
-                         | Group { id } -> id
-                         | Unknown { id } ->
-                             (unknown.id |.u Js.String.make) |.u
-                               FBID.ofStringUnsafe in
-                       thisId == id)
-                     [@res.braces ]))))
-         [@res.braces ]))
+let findThreadByIdLinearScan [arity:2]~threads:((threads)[@res.namedArgLoc ])
+   ~id:((id)[@res.namedArgLoc ])  =
+  ((Js.Array2.findi ThreadsModel.threads
+      (fun [arity:2]thread ->
+         fun i ->
+           ((let thisId =
+               match thread with
+               | ServerData.OneToOne { otherPersonIDWhichIsAlsoThreadID } ->
+                   otherPersonIDWhichIsAlsoThreadID
+               | Group { id } -> id
+               | Unknown { id } ->
+                   (unknown.id |.u Js.String.make) |.u FBID.ofStringUnsafe in
+             thisId == id)
+           [@res.braces ])))
+  [@res.braces ])
 let x = ((loop 0 (Nil |.u (push doc)))[@res.braces ])
 ;;match stack with
   | Empty -> [%rescript.exprhole ]