Remove Pexp_function, which is never produced by the parser.

Author: cristianoc

CHANGELOG.md

@@ -24,6 +24,7 @@
 - Ast cleanup: explicit representation for optional record fields in types. https://github.com/rescript-lang/rescript/pull/7190 https://github.com/rescript-lang/rescript/pull/7191
 - AST cleanup: first-class expression and patterns for records with optional fields. https://github.com/rescript-lang/rescript/pull/7192
 - AST cleanup: Represent the arity of uncurried function definitions directly in the AST. https://github.com/rescript-lang/rescript/pull/7197
+- AST cleanup: Remove Pexp_function from the AST. https://github.com/rescript-lang/rescript/pull/7198
 
 
 # 12.0.0-alpha.5

analysis/src/DocumentSymbol.ml

@@ -41,7 +41,6 @@ let command ~path =
   let rec exprKind (exp : Parsetree.expression) =
     match exp.pexp_desc with
     | Pexp_fun _ -> Function
-    | Pexp_function _ -> Function
     | Pexp_constraint (e, _) -> exprKind e
     | Pexp_constant (Pconst_string _) -> String
     | Pexp_constant (Pconst_float _ | Pconst_integer _) -> Number

analysis/src/Utils.ml

@@ -85,7 +85,6 @@ let identifyPexp pexp =
   | Parsetree.Pexp_ident _ -> "Pexp_ident"
   | Pexp_constant _ -> "Pexp_constant"
   | Pexp_let _ -> "Pexp_let"
-  | Pexp_function _ -> "Pexp_function"
   | Pexp_fun _ -> "Pexp_fun"
   | Pexp_apply _ -> "Pexp_apply"
   | Pexp_match _ -> "Pexp_match"

compiler/frontend/bs_ast_mapper.ml

@@ -319,7 +319,6 @@ module E = struct
       fun_ ~loc ~attrs ~arity lab
         (map_opt (sub.expr sub) def)
         (sub.pat sub p) (sub.expr sub e)
-    | Pexp_function pel -> function_ ~loc ~attrs (sub.cases sub pel)
     | Pexp_apply (e, l) ->
       apply ~loc ~attrs (sub.expr sub e) (List.map (map_snd (sub.expr sub)) l)
     | Pexp_match (e, pel) ->

compiler/frontend/bs_builtin_ppx.ml

@@ -110,9 +110,6 @@ let expr_mapper ~async_context ~in_function_def (self : mapper)
   | Pexp_constant (Pconst_integer (s, Some 'l')) ->
     {e with pexp_desc = Pexp_constant (Pconst_integer (s, None))}
   (* End rewriting *)
-  | Pexp_function _ ->
-    async_context := false;
-    default_expr_mapper self e
   | _
     when Ast_uncurried.expr_is_uncurried_fun e
          &&

compiler/ml/ast_helper.ml

@@ -152,7 +152,6 @@ module Exp = struct
   let let_ ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_let (a, b, c))
   let fun_ ?loc ?attrs ~arity a b c d =
     mk ?loc ?attrs (Pexp_fun (a, b, c, d, arity))
-  let function_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_function a)
   let apply ?loc ?attrs a b = mk ?loc ?attrs (Pexp_apply (a, b))
   let match_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_match (a, b))
   let try_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_try (a, b))

compiler/ml/ast_helper.mli

@@ -138,7 +138,6 @@ module Exp : sig
     pattern ->
     expression ->
     expression
-  val function_ : ?loc:loc -> ?attrs:attrs -> case list -> expression
   val apply :
     ?loc:loc ->
     ?attrs:attrs ->

compiler/ml/ast_iterator.ml

@@ -286,7 +286,6 @@ module E = struct
       iter_opt (sub.expr sub) def;
       sub.pat sub p;
       sub.expr sub e
-    | Pexp_function pel -> sub.cases sub pel
     | Pexp_apply (e, l) ->
       sub.expr sub e;
       List.iter (iter_snd (sub.expr sub)) l

compiler/ml/ast_mapper.ml

@@ -282,7 +282,6 @@ module E = struct
       fun_ ~loc ~attrs ~arity lab
         (map_opt (sub.expr sub) def)
         (sub.pat sub p) (sub.expr sub e)
-    | Pexp_function pel -> function_ ~loc ~attrs (sub.cases sub pel)
     | Pexp_apply (e, l) ->
       apply ~loc ~attrs (sub.expr sub e) (List.map (map_snd (sub.expr sub)) l)
     | Pexp_match (e, pel) ->

compiler/ml/ast_mapper_from0.ml

@@ -288,7 +288,7 @@ module E = struct
       fun_ ~loc ~attrs ~arity:None lab
         (map_opt (sub.expr sub) def)
         (sub.pat sub p) (sub.expr sub e)
-    | Pexp_function pel -> function_ ~loc ~attrs (sub.cases sub pel)
+    | Pexp_function _ -> assert false
     | Pexp_apply (e, l) ->
       apply ~loc ~attrs (sub.expr sub e) (List.map (map_snd (sub.expr sub)) l)
     | Pexp_match (e, pel) ->

compiler/ml/ast_mapper_to0.ml

@@ -287,7 +287,6 @@ module E = struct
       fun_ ~loc ~attrs lab
         (map_opt (sub.expr sub) def)
         (sub.pat sub p) (sub.expr sub e)
-    | Pexp_function pel -> function_ ~loc ~attrs (sub.cases sub pel)
     | Pexp_apply (e, l) ->
       apply ~loc ~attrs (sub.expr sub e) (List.map (map_snd (sub.expr sub)) l)
     | Pexp_match (e, pel) ->

compiler/ml/depend.ml

@@ -221,7 +221,6 @@ let rec add_expr bv exp =
   | Pexp_fun (_, opte, p, e, _) ->
     add_opt add_expr bv opte;
     add_expr (add_pattern bv p) e
-  | Pexp_function pel -> add_cases bv pel
   | Pexp_apply (e, el) ->
     add_expr bv e;
     List.iter (fun (_, e) -> add_expr bv e) el

compiler/ml/parsetree.ml

@@ -224,7 +224,6 @@ and expression_desc =
     (* let P1 = E1 and ... and Pn = EN in E       (flag = Nonrecursive)
        let rec P1 = E1 and ... and Pn = EN in E   (flag = Recursive)
     *)
-  | Pexp_function of case list (* function P1 -> E1 | ... | Pn -> En *)
   | Pexp_fun of
       arg_label * expression option * pattern * expression * int option
     (* fun P -> E1                          (Simple, None)

compiler/ml/pprintast.ml

@@ -535,7 +535,7 @@ and expression ctxt f x =
     pp f "((%a)@,%a)" (expression ctxt) {x with pexp_attributes=[]}
       (attributes ctxt) x.pexp_attributes
   else match x.pexp_desc with
-    | Pexp_function _ | Pexp_fun _ | Pexp_match _ | Pexp_try _ | Pexp_sequence _
+    | Pexp_fun _ | Pexp_match _ | Pexp_try _ | Pexp_sequence _
       when ctxt.pipe || ctxt.semi ->
         paren true (expression reset_ctxt) f x
     | Pexp_ifthenelse _ | Pexp_sequence _ when ctxt.ifthenelse ->
@@ -551,8 +551,6 @@ and expression ctxt f x =
         pp f "@[<2>fun@;%s%a->@;%a@]"
           arity_str (label_exp ctxt) (l, e0, p)
           (expression ctxt) e
-    | Pexp_function l ->
-        pp f "@[<hv>function%a@]" (case_list ctxt) l
     | Pexp_match (e, l) ->
         pp f "@[<hv0>@[<hv0>@[<2>match %a@]@ with@]%a@]"
           (expression reset_ctxt) e (case_list ctxt) l

compiler/ml/printast.ml

@@ -233,9 +233,6 @@ and expression i ppf x =
     line i ppf "Pexp_let %a\n" fmt_rec_flag rf;
     list i value_binding ppf l;
     expression i ppf e
-  | Pexp_function l ->
-    line i ppf "Pexp_function\n";
-    list i case ppf l
   | Pexp_fun (l, eo, p, e, arity) ->
     line i ppf "Pexp_fun\n";
     let () =

compiler/ml/typecore.ml

@@ -137,7 +137,6 @@ let iter_expression f e =
     | Pexp_extension _ (* we don't iterate under extension point *)
     | Pexp_ident _ | Pexp_new _ | Pexp_constant _ ->
       ()
-    | Pexp_function pel -> List.iter case pel
     | Pexp_fun (_, eo, _, e, _) ->
       may expr eo;
       expr e
@@ -1917,8 +1916,6 @@ let rec type_approx env sexp =
   | Pexp_fun (p, _, _, e, _arity) ->
     let ty = if is_optional p then type_option (newvar ()) else newvar () in
     newty (Tarrow (p, ty, type_approx env e, Cok))
-  | Pexp_function ({pc_rhs = e} :: _) ->
-    newty (Tarrow (Nolabel, newvar (), type_approx env e, Cok))
   | Pexp_match (_, {pc_rhs = e} :: _) -> type_approx env e
   | Pexp_try (e, _) -> type_approx env e
   | Pexp_tuple l -> newty (Ttuple (List.map (type_approx env) l))
@@ -2417,9 +2414,6 @@ and type_expect_ ?type_clash_context ?in_function ?(recarg = Rejected) env sexp
   | Pexp_fun (l, None, spat, sbody, _arity) ->
     type_function ?in_function loc sexp.pexp_attributes env ty_expected l
       [Ast_helper.Exp.case spat sbody]
-  | Pexp_function caselist ->
-    type_function ?in_function loc sexp.pexp_attributes env ty_expected Nolabel
-      caselist
   | Pexp_apply (sfunct, sargs) ->
     assert (sargs <> []);
     begin_def ();

compiler/syntax/src/res_ast_debugger.ml

@@ -558,9 +558,6 @@ module SexpAst = struct
             Sexp.list (map_empty ~f:value_binding vbs);
             expression expr;
           ]
-      | Pexp_function cases ->
-        Sexp.list
-          [Sexp.atom "Pexp_function"; Sexp.list (map_empty ~f:case cases)]
       | Pexp_fun (arg_lbl, expr_opt, pat, expr, _) ->
         Sexp.list
           [

compiler/syntax/src/res_parens.ml

@@ -51,8 +51,8 @@ let call_expr expr =
     | {
      pexp_desc =
        ( Pexp_lazy _ | Pexp_assert _ | Pexp_fun _ | Pexp_newtype _
-       | Pexp_function _ | Pexp_constraint _ | Pexp_setfield _ | Pexp_match _
-       | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_ifthenelse _ );
+       | Pexp_constraint _ | Pexp_setfield _ | Pexp_match _ | Pexp_try _
+       | Pexp_while _ | Pexp_for _ | Pexp_ifthenelse _ );
     } ->
       Parenthesized
     | _ when Ast_uncurried.expr_is_uncurried_fun expr -> Parenthesized
@@ -104,7 +104,7 @@ let unary_expr_operand expr =
     | {
      pexp_desc =
        ( Pexp_lazy _ | Pexp_assert _ | Pexp_fun _ | Pexp_newtype _
-       | Pexp_function _ | Pexp_constraint _ | Pexp_setfield _
+       | Pexp_constraint _ | Pexp_setfield _
        | Pexp_extension _ (* readability? maybe remove *) | Pexp_match _
        | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_ifthenelse _ );
     } ->
@@ -132,10 +132,7 @@ let binary_expr_operand ~is_lhs expr =
     | {pexp_desc = Pexp_fun _}
       when ParsetreeViewer.is_underscore_apply_sugar expr ->
       Nothing
-    | {
-     pexp_desc =
-       Pexp_constraint _ | Pexp_fun _ | Pexp_function _ | Pexp_newtype _;
-    } ->
+    | {pexp_desc = Pexp_constraint _ | Pexp_fun _ | Pexp_newtype _} ->
       Parenthesized
     | _ when Ast_uncurried.expr_is_uncurried_fun expr -> Parenthesized
     | expr when ParsetreeViewer.is_binary_expression expr -> Parenthesized
@@ -228,8 +225,8 @@ let lazy_or_assert_or_await_expr_rhs ?(in_await = false) expr =
     | {
      pexp_desc =
        ( Pexp_lazy _ | Pexp_assert _ | Pexp_fun _ | Pexp_newtype _
-       | Pexp_function _ | Pexp_constraint _ | Pexp_setfield _ | Pexp_match _
-       | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_ifthenelse _ );
+       | Pexp_constraint _ | Pexp_setfield _ | Pexp_match _ | Pexp_try _
+       | Pexp_while _ | Pexp_for _ | Pexp_ifthenelse _ );
     } ->
       Parenthesized
     | _
@@ -276,9 +273,8 @@ let field_expr expr =
      pexp_desc =
        ( Pexp_lazy _ | Pexp_assert _
        | Pexp_extension _ (* %extension.x vs (%extension).x *) | Pexp_fun _
-       | Pexp_newtype _ | Pexp_function _ | Pexp_constraint _ | Pexp_setfield _
-       | Pexp_match _ | Pexp_try _ | Pexp_while _ | Pexp_for _
-       | Pexp_ifthenelse _ );
+       | Pexp_newtype _ | Pexp_constraint _ | Pexp_setfield _ | Pexp_match _
+       | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_ifthenelse _ );
     } ->
       Parenthesized
     | _ when ParsetreeViewer.has_await_attribute expr.pexp_attributes ->

compiler/syntax/src/res_printer.ml

@@ -3394,8 +3394,6 @@ and print_expression ~state (e : Parsetree.expression) cmt_tbl =
           Doc.space;
           print_cases ~state cases cmt_tbl;
         ]
-    | Pexp_function cases ->
-      Doc.concat [Doc.text "x => switch x "; print_cases ~state cases cmt_tbl]
     | Pexp_coerce (expr, (), typ) ->
       let doc_expr = print_expression_with_comments ~state expr cmt_tbl in
       let doc_typ = print_typ_expr ~state typ cmt_tbl in