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) ->