cleanup

Author: zth

compiler/syntax/src/res_core.ml

@@ -4411,6 +4411,25 @@ and parse_dict_expr ~start_pos p =
             chunk_loc))
       [(Asttypes.Nolabel, Ast_helper.Exp.array ~loc:chunk_loc key_value_pairs)]
   in
+  let make_dict_spread target_expr source_parts =
+    let spread_ident =
+      Ast_helper.Exp.ident ~loc ~attrs:[dict_spread_attr]
+        (Location.mkloc
+           (Longident.Ldot (Longident.Lident Primitive_modules.dict, "spread"))
+           loc)
+    in
+    Ast_helper.Exp.apply ~loc spread_ident
+      [
+        (Asttypes.Nolabel, target_expr);
+        ( Asttypes.Nolabel,
+          Ast_helper.Exp.array ~loc
+            (List.map
+               (function
+                 | `Rows rows -> make_dict_chunk rows
+                 | `Spread spread_expr -> spread_expr)
+               source_parts) );
+      ]
+  in
   let grouped_parts =
     let rec loop current_rows acc = function
       | [] ->
@@ -4436,47 +4455,8 @@ and parse_dict_expr ~start_pos p =
   | [] -> make_dict_chunk ~loc_override:loc []
   | [`Rows rows] -> make_dict_chunk ~loc_override:loc rows
   | `Rows target_rows :: source_parts ->
-    let spread_ident =
-      Ast_helper.Exp.ident ~loc ~attrs:[dict_spread_attr]
-        (Location.mkloc
-           (Longident.Ldot (Longident.Lident Primitive_modules.dict, "spread"))
-           loc)
-    in
-    let spread =
-      Ast_helper.Exp.apply ~loc spread_ident
-        [
-          (Asttypes.Nolabel, make_dict_chunk target_rows);
-          ( Asttypes.Nolabel,
-            Ast_helper.Exp.array ~loc
-              (List.map
-                 (function
-                   | `Rows rows -> make_dict_chunk rows
-                   | `Spread spread_expr -> spread_expr)
-                 source_parts) );
-        ]
-    in
-    spread
-  | source_parts ->
-    let spread_ident =
-      Ast_helper.Exp.ident ~loc ~attrs:[dict_spread_attr]
-        (Location.mkloc
-           (Longident.Ldot (Longident.Lident Primitive_modules.dict, "spread"))
-           loc)
-    in
-    let spread =
-      Ast_helper.Exp.apply ~loc spread_ident
-        [
-          (Asttypes.Nolabel, make_dict_chunk []);
-          ( Asttypes.Nolabel,
-            Ast_helper.Exp.array ~loc
-              (List.map
-                 (function
-                   | `Rows rows -> make_dict_chunk rows
-                   | `Spread spread_expr -> spread_expr)
-                 source_parts) );
-        ]
-    in
-    spread
+    make_dict_spread (make_dict_chunk target_rows) source_parts
+  | source_parts -> make_dict_spread (make_dict_chunk []) source_parts
 
 and parse_array_exp p =
   let start_pos = p.Parser.start_pos in

compiler/syntax/src/res_grammar.ml

@@ -224,7 +224,7 @@ let is_mod_expr_start = function
   | _ -> false
 
 let is_dict_row_start = function
-  | Token.DotDotDot | Token.String _ -> true
+  | Token.DotDotDot | String _ -> true
   | _ -> false
 
 let is_record_row_start = function

compiler/syntax/src/res_parsetree_viewer.ml

@@ -748,17 +748,17 @@ let is_spread_belt_array_concat expr =
     has_spread_attr expr.pexp_attributes
   | _ -> false
 
-let collect_spread_dict_expr_parts expr =
-  let is_tuple_array_expr (expr : Parsetree.expression) =
-    let is_plain_tuple (expr : Parsetree.expression) =
-      match expr with
-      | {pexp_desc = Pexp_tuple _} -> true
-      | _ -> false
-    in
+let is_tuple_array (expr : Parsetree.expression) =
+  let is_plain_tuple (expr : Parsetree.expression) =
     match expr with
-    | {pexp_desc = Pexp_array items} -> List.for_all is_plain_tuple items
+    | {pexp_desc = Pexp_tuple _} -> true
     | _ -> false
   in
+  match expr with
+  | {pexp_desc = Pexp_array items} -> List.for_all is_plain_tuple items
+  | _ -> false
+
+let collect_spread_dict_expr_parts expr =
   let extract_literal_dict_rows (expr : Parsetree.expression) =
     match expr with
     | {
@@ -774,7 +774,7 @@ let collect_spread_dict_expr_parts expr =
            args = [(Nolabel, key_values)];
          };
     }
-      when is_tuple_array_expr key_values ->
+      when is_tuple_array key_values ->
       Some key_values
     | _ -> None
   in
@@ -869,16 +869,6 @@ let is_rewritten_underscore_apply_sugar expr =
   | Pexp_ident {txt = Longident.Lident "_"} -> true
   | _ -> false
 
-let is_tuple_array (expr : Parsetree.expression) =
-  let is_plain_tuple (expr : Parsetree.expression) =
-    match expr with
-    | {pexp_desc = Pexp_tuple _} -> true
-    | _ -> false
-  in
-  match expr with
-  | {pexp_desc = Pexp_array items} -> List.for_all is_plain_tuple items
-  | _ -> false
-
 let get_jsx_prop_loc = function
   | Parsetree.JSXPropPunning (_, name) -> name.loc
   | Parsetree.JSXPropValue (name, _, value) ->