Fix rec flag generation.

Author: Tim-ats-d

src/analysis/refactor_extract_region.ml

@@ -25,29 +25,26 @@ end
 module Gen = struct
   let unit = Longident.Lident "()" |> Location.mknoloc
 
-  let rec_flag recursive =
-    if recursive then Asttypes.Recursive else Nonrecursive
-
   (* Generates [let name = body]. *)
-  let toplevel_let ~recursive ~name ~body =
+  let toplevel_let ~name ~body =
     let open Ast_helper in
     let pattern = Pat.mk (Ppat_var { txt = name; loc = Location.none }) in
     let body = Parsetree_utils.filter_expr_attr body in
-    Str.value (rec_flag recursive) [ Vb.mk pattern body ]
+    Str.value Nonrecursive [ Vb.mk pattern body ]
 
   (* Generates [let name () = body]. *)
-  let let_unit_toplevel ~recursive ~name ~body =
+  let let_unit_toplevel ~name ~body =
     let open Ast_helper in
     let unit_param =
       { Parsetree.pparam_loc = Location.none;
         pparam_desc = Pparam_val (Nolabel, None, Pat.construct unit None)
       }
     in
     let body = Exp.function_ [ unit_param ] None (Pfunction_body body) in
-    toplevel_let ~recursive ~name ~body
+    toplevel_let ~name ~body
 
   (* Generates [let name params = body]. *)
-  let toplevel_function ~recursive params ~name ~body =
+  let toplevel_function params ~name ~body =
     let open Ast_helper in
     let params =
       List.map
@@ -63,7 +60,7 @@ module Gen = struct
         params
     in
     let body = Exp.function_ params None (Pfunction_body body) in
-    toplevel_let ~recursive ~name ~body
+    toplevel_let ~name ~body
 
   let ident ~name =
     Longident.Lident name |> Location.mknoloc |> Ast_helper.Exp.ident
@@ -121,14 +118,11 @@ and toplevel_item = { rec_flag : Asttypes.rec_flag; loc : Location.t }
 (* A convenient type for grouping info. *)
 
 and generated_binding =
-  recursive:bool ->
-  name:string ->
-  body:Parsetree.expression ->
-  Parsetree.structure_item
+  name:string -> body:Parsetree.expression -> Parsetree.structure_item
 
 and generated_call = name:string -> Parsetree.expression
 
-let is_recursive_vb = function
+let is_recursive = function
   | { rec_flag = Asttypes.Recursive; _ } -> true
   | { rec_flag = Nonrecursive; _ } -> false
 
@@ -170,7 +164,6 @@ let analyze_expr expr env ~toplevel_item ~mconfig ~local_defs =
       loc_ghost = false
     }
   in
-  let is_parent_recursive = is_recursive_vb toplevel_item in
   Browse_tree.of_node ~env (Browse_raw.Expression expr)
   |> occuring_vars
   |> List.fold_left
@@ -182,10 +175,13 @@ let analyze_expr expr env ~toplevel_item ~mconfig ~local_defs =
              ~env ~local_defs ~namespace:Value var_path
          with
          | `Found { location; approximated = false; _ } ->
-           if Location_aux.included location ~into:unbounded_enclosing then
-             { acc with bounded_vars = var_path :: acc.bounded_vars }
-           else if
-             is_parent_recursive
+           let acc =
+             if Location_aux.included location ~into:unbounded_enclosing then
+               { acc with bounded_vars = var_path :: acc.bounded_vars }
+             else acc
+           in
+           if
+             is_recursive toplevel_item
              && Location_aux.included location ~into:toplevel_item.loc
            then { acc with gen_binding_kind = Rec_and }
            else acc
@@ -235,15 +231,13 @@ let extract_to_toplevel
     match gen_binding_kind with
     | Non_recursive ->
       let fresh_let_binding =
-        generated_binding
-          ~recursive:(is_recursive_vb toplevel_item)
-          ~name:val_name ~body:untyped_expr
+        generated_binding ~name:val_name ~body:untyped_expr
         |> Format.asprintf "%a" Pprintast.structure_item
       in
       fresh_let_binding ^ "\n" ^ substitued_toplevel_binding
     | Rec_and ->
       let fresh_let_binding =
-        generated_binding ~recursive:false ~name:val_name ~body:untyped_expr
+        generated_binding ~name:val_name ~body:untyped_expr
         |> Format.asprintf "%a" Pprintast.structure_item
       in
       let fresh_and_binding =
@@ -260,7 +254,7 @@ let extract_to_toplevel
     let prefix_length =
       match gen_binding_kind with
       | Non_recursive ->
-        if is_recursive_vb toplevel_item then String.length "let rec "
+        if is_recursive toplevel_item then String.length "let rec "
         else String.length "let "
       | Rec_and -> String.length "and "
     in