Remove last use of core_type_is_uncurried_fun.

Author: cristianoc

compiler/frontend/ast_core_type.ml

@@ -124,10 +124,10 @@ let get_uncurry_arity (ty : t) =
   | _ -> None
 
 let get_curry_arity (ty : t) =
-  if Ast_uncurried.core_type_is_uncurried_fun ty then
-    let arity, _ = Ast_uncurried.core_type_extract_uncurried_fun ty in
-    arity
-  else get_uncurry_arity_aux ty 0
+  match Ast_uncurried.core_type_remove_function_dollar ty with
+  | {ptyp_desc = Ptyp_arrow (_, _, _, Some arity)} -> arity
+  | _ -> get_uncurry_arity_aux ty 0
+
 let is_arity_one ty = get_curry_arity ty = 1
 
 type param_type = {

compiler/ml/ast_uncurried.ml

@@ -28,20 +28,6 @@ let expr_extract_uncurried_fun (expr : Parsetree.expression) =
   | Pexp_fun (_, _, _, _, Some _) -> expr
   | _ -> assert false
 
-let core_type_is_uncurried_fun (typ : Parsetree.core_type) =
-  match typ.ptyp_desc with
-  | Ptyp_constr ({txt = Lident "function$"}, [{ptyp_desc = Ptyp_arrow _}]) ->
-    true
-  | _ -> false
-
-let core_type_extract_uncurried_fun (typ : Parsetree.core_type) =
-  match typ.ptyp_desc with
-  | Ptyp_constr
-      ( {txt = Lident "function$"},
-        [({ptyp_desc = Ptyp_arrow (_, _, _, Some arity)} as t_arg)] ) ->
-    (arity, t_arg)
-  | _ -> assert false
-
 (* Typed AST *)
 
 let tarrow_to_arity (t_arity : Types.type_expr) =

compiler/ml/ast_untagged_variants.ml

@@ -186,14 +186,9 @@ let type_to_instanceof_backed_obj (t : Types.type_expr) =
     | _ -> None)
   | _ -> None
 
-let remove_function_dollar (typ : Types.type_expr) =
-  match typ.desc with
-  | Tconstr (Pident {name = "function$"}, [t], _) -> t
-  | _ -> typ
-
 let get_block_type_from_typ ~env (t : Types.type_expr) : block_type option =
   let t = !expand_head env t in
-  let t = remove_function_dollar t in
+  let t = Tmp_uncurried.remove_function_dollar t in
   match t with
   | {desc = Tconstr (path, _, _)} when Path.same path Predef.path_string ->
     Some StringType

compiler/ml/tmp_uncurried.ml

@@ -0,0 +1,4 @@
+let remove_function_dollar (typ : Types.type_expr) =
+  match typ.desc with
+  | Tconstr (Pident {name = "function$"}, [t], _) -> t
+  | _ -> typ