From 78751bd4a6255ac9b5c6821e2a317a900c12e6e4 Mon Sep 17 00:00:00 2001
From: Patrick Ferris <patrick@sirref.org>
Date: Mon, 21 Oct 2024 16:20:21 +0100
Subject: [PATCH] Prepare for 5.2 AST bump

---
 src/ppx/uncurried_utils.ml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/ppx/uncurried_utils.ml b/src/ppx/uncurried_utils.ml
index fdd6ff00..778c4928 100644
--- a/src/ppx/uncurried_utils.ml
+++ b/src/ppx/uncurried_utils.ml
@@ -49,15 +49,21 @@ let wrap_core_type_uncurried ?(arity = 1) typ =
   | false -> typ
   | true -> ctyp_arrow ~loc:typ.ptyp_loc ~arity typ
 
+let rec determine_arity_params acc = function
+  | { pparam_desc = Pparam_val _; _ } :: rest -> determine_arity_params (acc + 1) rest
+  | { pparam_desc = Pparam_newtype _; _ } :: rest -> determine_arity_params acc rest
+  | [] -> acc
+  
 let rec determineArity ~arity expr =
   match expr.pexp_desc with
-  | Pexp_fun (_, _, _, fn) -> determineArity ~arity:(arity + 1) fn
+  | Pexp_function (params, _, Pfunction_body fn) -> determineArity ~arity:(arity + determine_arity_params 0 params) fn
+  | Pexp_function (params, _, Pfunction_cases _) -> determine_arity_params 0 params
   | _ -> arity
 
 let wrap_as_uncurried_vb ?(arity = 1) item =
   match (Ppx_config.uncurried (), item) with
   | false, _ -> item
-  | _, ({ pvb_expr = { pexp_desc = Pexp_fun _ } as fn } as outerV) ->
+  | _, ({ pvb_expr = { pexp_desc = Pexp_function ((_ :: _), _, _) } as fn } as outerV) ->
     {
       outerV with
       pvb_expr = function_expression_uncurried ~loc:outerV.pvb_loc ~arity fn;
@@ -81,7 +87,7 @@ let wrap_as_uncurried_fn_multi ?(arity = 1) item =
     let new_value_bindings =
       value_bindings
       |> List.map (function
-           | { pvb_expr = { pexp_desc = Pexp_fun _ } as fn } as outerV ->
+           | { pvb_expr = { pexp_desc = Pexp_function ((_ :: _), _, _) } as fn } as outerV ->
              {
                outerV with
                pvb_expr =
@@ -119,7 +125,7 @@ let wrap_sig_uncurried_fn ?(arity = 1) item =
 let handle_str_item item =
   match item.pstr_desc with
   | Pstr_value
-      (a1, [ ({ pvb_expr = { pexp_desc = Pexp_fun _ } as fn } as outerV) ]) ->
+      (a1, [ ({ pvb_expr = { pexp_desc = Pexp_function ((_ :: _), _, _) } as fn } as outerV) ]) ->
     {
       item with
       pstr_desc =