PR#8908: used as a base for other PRs.pr8908

1 files changed, 10 insertions, 6 deletions

diff --git a/parsing/ast_iterator.ml b/parsing/ast_iterator.ml
index c6806a9bb9..5f016c0089 100644
--- a/parsing/ast_iterator.ml
+++ b/parsing/ast_iterator.ml
@@ -233,6 +233,12 @@ module CT = struct
     List.iter (sub.class_type_field sub) pcsig_fields
 end
 
+let iter_functor_param sub = function
+  | Unit -> ()
+  | Named (name, mty) ->
+    iter_loc sub name;
+    sub.module_type sub mty
+
 module MT = struct
   (* Type expressions for the module language *)
 
@@ -243,9 +249,8 @@ module MT = struct
     | Pmty_ident s -> iter_loc sub s
     | Pmty_alias s -> iter_loc sub s
     | Pmty_signature sg -> sub.signature sub sg
-    | Pmty_functor (s, mt1, mt2) ->
-        iter_loc sub s;
-        iter_opt (sub.module_type sub) mt1;
+    | Pmty_functor (param, mt2) ->
+        iter_functor_param sub param;
         sub.module_type sub mt2
     | Pmty_with (mt, l) ->
         sub.module_type sub mt;
@@ -298,9 +303,8 @@ module M = struct
     match desc with
     | Pmod_ident x -> iter_loc sub x
     | Pmod_structure str -> sub.structure sub str
-    | Pmod_functor (arg, arg_ty, body) ->
-        iter_loc sub arg;
-        iter_opt (sub.module_type sub) arg_ty;
+    | Pmod_functor (param, body) ->
+        iter_functor_param sub param;
         sub.module_expr sub body
     | Pmod_apply (m1, m2) ->
         sub.module_expr sub m1; sub.module_expr sub m2