Remove dotted processing.

Author: cristianoc

jscomp/syntax/src/res_core.ml

@@ -182,11 +182,7 @@ let tagged_template_literal_attr =
 
 let spread_attr = (Location.mknoloc "res.spread", Parsetree.PStr [])
 
-type argument = {
-  dotted: bool;
-  label: Asttypes.arg_label;
-  expr: Parsetree.expression;
-}
+type argument = {label: Asttypes.arg_label; expr: Parsetree.expression}
 
 type type_parameter = {
   attrs: Ast_helper.attrs;
@@ -3574,7 +3570,6 @@ and parse_argument p : argument option =
   then
     match p.Parser.token with
     | Dot -> (
-      let dotted = true in
       Parser.next p;
       match p.token with
       (* apply(.) *)
@@ -3584,12 +3579,12 @@ and parse_argument p : argument option =
             (Location.mknoloc (Longident.Lident "()"))
             None
         in
-        Some {dotted; label = Asttypes.Nolabel; expr = unit_expr}
-      | _ -> parse_argument2 p ~dotted)
-    | _ -> parse_argument2 p ~dotted:false
+        Some {label = Asttypes.Nolabel; expr = unit_expr}
+      | _ -> parse_argument2 p)
+    | _ -> parse_argument2 p
   else None
 
-and parse_argument2 p ~dotted : argument option =
+and parse_argument2 p : argument option =
   match p.Parser.token with
   (* foo(_), do not confuse with foo(_ => x), TODO: performance *)
   | Underscore when not (is_es6_arrow_expression ~in_ternary:false p) ->
@@ -3598,7 +3593,7 @@ and parse_argument2 p ~dotted : argument option =
     let expr =
       Ast_helper.Exp.ident ~loc (Location.mkloc (Longident.Lident "_") loc)
     in
-    Some {dotted; label = Nolabel; expr}
+    Some {label = Nolabel; expr}
   | Tilde -> (
     Parser.next p;
     (* TODO: nesting of pattern matches not intuitive for error recovery *)
@@ -3618,7 +3613,7 @@ and parse_argument2 p ~dotted : argument option =
       match p.Parser.token with
       | Question ->
         Parser.next p;
-        Some {dotted; label = Optional ident; expr = ident_expr}
+        Some {label = Optional ident; expr = ident_expr}
       | Equal ->
         Parser.next p;
         let label =
@@ -3639,21 +3634,20 @@ and parse_argument2 p ~dotted : argument option =
             let expr = parse_constrained_or_coerced_expr p in
             {expr with pexp_attributes = prop_loc_attr :: expr.pexp_attributes}
         in
-        Some {dotted; label; expr}
+        Some {label; expr}
       | Colon ->
         Parser.next p;
         let typ = parse_typ_expr p in
         let loc = mk_loc start_pos p.prev_end_pos in
         let expr =
           Ast_helper.Exp.constraint_ ~attrs:[prop_loc_attr] ~loc ident_expr typ
         in
-        Some {dotted; label = Labelled ident; expr}
-      | _ -> Some {dotted; label = Labelled ident; expr = ident_expr})
+        Some {label = Labelled ident; expr}
+      | _ -> Some {label = Labelled ident; expr = ident_expr})
     | t ->
       Parser.err p (Diagnostics.lident t);
-      Some {dotted; label = Nolabel; expr = Recover.default_expr ()})
-  | _ ->
-    Some {dotted; label = Nolabel; expr = parse_constrained_or_coerced_expr p}
+      Some {label = Nolabel; expr = Recover.default_expr ()})
+  | _ -> Some {label = Nolabel; expr = parse_constrained_or_coerced_expr p}
 
 and parse_call_expr p fun_expr =
   Parser.expect Lparen p;
@@ -3682,7 +3676,6 @@ and parse_call_expr p fun_expr =
       (* No args -> unit sugar: `foo()` *)
       [
         {
-          dotted = false;
           label = Nolabel;
           expr =
             Ast_helper.Exp.construct ~loc
@@ -3692,7 +3685,6 @@ and parse_call_expr p fun_expr =
       ]
     | [
      {
-       dotted = true;
        label = Nolabel;
        expr =
          {
@@ -3718,7 +3710,6 @@ and parse_call_expr p fun_expr =
        *)
       [
         {
-          dotted = true;
           label = Nolabel;
           expr =
             Ast_helper.Exp.let_ Asttypes.Nonrecursive
@@ -3736,19 +3727,14 @@ and parse_call_expr p fun_expr =
   let loc = {fun_expr.pexp_loc with loc_end = p.prev_end_pos} in
   let args =
     match args with
-    | {dotted = d; label = lbl; expr} :: args ->
-      let group (grp, acc) {dotted; label = lbl; expr} =
-        let _d, grp = grp in
-        if dotted == true then ((true, [(lbl, expr)]), (_d, List.rev grp) :: acc)
-        else ((_d, (lbl, expr) :: grp), acc)
-      in
-      let (_d, grp), acc = List.fold_left group ((d, [(lbl, expr)]), []) args in
-      List.rev ((_d, List.rev grp) :: acc)
+    | {label = lbl; expr} :: args ->
+      let group (grp, acc) {label = lbl; expr} = ((lbl, expr) :: grp, acc) in
+      let grp, acc = List.fold_left group ([(lbl, expr)], []) args in
+      List.rev (List.rev grp :: acc)
     | [] -> []
   in
   let apply =
-    Ext_list.fold_left args fun_expr (fun call_body group ->
-        let _, args = group in
+    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

jscomp/syntax/src/res_parsetree_viewer.ml

@@ -48,15 +48,6 @@ let functor_type modtype =
   in
   process [] modtype
 
-let process_bs_attribute attrs =
-  let rec process bs_spotted acc attrs =
-    match attrs with
-    | [] -> (bs_spotted, List.rev acc)
-    | ({Location.txt = "bs"}, _) :: rest -> process true acc rest
-    | attr :: rest -> process bs_spotted (attr :: acc) rest
-  in
-  process false [] attrs
-
 let process_uncurried_app_attribute attrs =
   let rec process uncurried_app acc attrs =
     match attrs with

jscomp/syntax/src/res_parsetree_viewer.mli

@@ -14,9 +14,6 @@ val functor_type :
   list
   * Parsetree.module_type
 
-(* filters @bs out of the provided attributes *)
-val process_bs_attribute : Parsetree.attributes -> bool * Parsetree.attributes
-
 val process_uncurried_app_attribute :
   Parsetree.attributes -> bool * Parsetree.attributes
 

jscomp/syntax/src/res_printer.ml

@@ -1547,12 +1547,6 @@ and print_typ_expr ~(state : State.t) (typ_expr : Parsetree.core_type) cmt_tbl =
     let attrs_before, args, return_type =
       ParsetreeViewer.arrow_type ~arity typ_expr
     in
-    let dotted, attrs_before =
-      let dotted = false in
-      (* Converting .ml code to .res requires processing uncurried attributes *)
-      let has_bs, attrs = ParsetreeViewer.process_bs_attribute attrs_before in
-      (dotted || has_bs, attrs)
-    in
     let return_type_needs_parens =
       match return_type.ptyp_desc with
       | Ptyp_alias _ -> true
@@ -1565,7 +1559,7 @@ and print_typ_expr ~(state : State.t) (typ_expr : Parsetree.core_type) cmt_tbl =
     in
     match args with
     | [] -> Doc.nil
-    | [([], Nolabel, n)] when not dotted ->
+    | [([], Nolabel, n)] ->
       let has_attrs_before = not (attrs_before = []) in
       let attrs =
         if has_attrs_before then
@@ -1607,7 +1601,6 @@ and print_typ_expr ~(state : State.t) (typ_expr : Parsetree.core_type) cmt_tbl =
               (Doc.concat
                  [
                    Doc.soft_line;
-                   (if dotted then Doc.concat [Doc.dot; Doc.space] else Doc.nil);
                    Doc.join
                      ~sep:(Doc.concat [Doc.comma; Doc.line])
                      (List.map
@@ -1901,8 +1894,6 @@ and print_object_field ~state (field : Parsetree.object_field) cmt_tbl =
  * i.e. ~foo: string, ~bar: float *)
 and print_type_parameter ~state (attrs, lbl, typ) cmt_tbl =
   (* Converting .ml code to .res requires processing uncurried attributes *)
-  let has_bs, attrs = ParsetreeViewer.process_bs_attribute attrs in
-  let dotted = if has_bs then Doc.concat [Doc.dot; Doc.space] else Doc.nil in
   let attrs = print_attributes ~state attrs cmt_tbl in
   let label =
     match lbl with
@@ -1927,13 +1918,7 @@ and print_type_parameter ~state (attrs, lbl, typ) cmt_tbl =
   let doc =
     Doc.group
       (Doc.concat
-         [
-           dotted;
-           attrs;
-           label;
-           print_typ_expr ~state typ cmt_tbl;
-           optional_indicator;
-         ])
+         [attrs; label; print_typ_expr ~state typ cmt_tbl; optional_indicator])
   in
   print_comments doc cmt_tbl loc
 
@@ -5100,8 +5085,6 @@ and print_exp_fun_parameter ~state parameter cmt_tbl =
                 lbls);
          ])
   | Parameter {attrs; lbl; default_expr; pat = pattern} ->
-    let has_bs, attrs = ParsetreeViewer.process_bs_attribute attrs in
-    let dotted = if has_bs then Doc.concat [Doc.dot; Doc.space] else Doc.nil in
     let attrs = print_attributes ~state attrs cmt_tbl in
     (* =defaultValue *)
     let default_expr_doc =
@@ -5160,7 +5143,6 @@ and print_exp_fun_parameter ~state parameter cmt_tbl =
       Doc.group
         (Doc.concat
            [
-             dotted;
              attrs;
              label_with_pattern;
              default_expr_doc;

jscomp/syntax/tests/parsing/grammar/expressions/expected/uncurried.res.txt

@@ -27,4 +27,4 @@ let f =
          fun ((b)[@attr2 ]) -> fun ((c)[@attr3 ]) -> fun ((d)[@attr4 ]) -> ()))
   [@res.arity 4])
 ;;((add 1 2)[@res.uapp ])
-;;((((((add 2 3 4)[@res.uapp ]) 5 6 7)[@res.uapp ]) 8 9 10)[@res.uapp ])
+;;((add 2 3 4 5 6 7 8 9 10)[@res.uapp ])