fix problems

Author: Lucccyo

src/sys/stm_tests.ml

@@ -8,7 +8,6 @@ struct
     | Mkdir of string list * string * int
     | Rmdir of string list * string
     | Readdir of string list
-    | Rename of string 
     | Touch of string list * string * int
     [@@deriving show { with_path = false }]
 
@@ -23,19 +22,19 @@ struct
   type sut   = unit
 
   let (/) = Filename.concat
+  
+  let update_map_name map_name k v = Map_names.add k v (Map_names.remove k map_name)
 
   let arb_cmd _s  =
     let name_gen = Gen.(oneofl ["aaa" ; "bbb" ; "ccc" ; "ddd" ; "eee"]) in
-    (* ameliorer ca avec d'autre caracteres,  *)
-    (* let name_gen = Gen.small_string in *)
     let path_gen = Gen.map (fun path -> path) (Gen.list_size (Gen.int_bound 5) name_gen) in (* can be empty *)
     let perm_gen = Gen.(oneofl [0o777]) in
     QCheck.make ~print:show_cmd
       Gen.(oneof
             [
                 map (fun path -> File_exists (path)) path_gen ;
                 map3 (fun path new_dir_name perm -> Mkdir (path, new_dir_name, perm)) path_gen name_gen perm_gen;
-                map2  (fun path delete_dir_name -> Rmdir (path, delete_dir_name)) path_gen name_gen;
+                map2 (fun path delete_dir_name -> Rmdir (path, delete_dir_name)) path_gen name_gen;
                 map (fun path -> Readdir (path)) path_gen;
                 map3 (fun path new_file_name perm -> Touch (path, new_file_name, perm)) path_gen name_gen perm_gen;
             ])
@@ -44,8 +43,6 @@ struct
 
   let init_state  = Directory {perm = 0o777; fs_map = Map_names.empty}
 
-  let update_map_name map_name k v = Map_names.add k v (Map_names.remove k map_name)
-
   let rec find_opt fs path =
     match fs with
     | File f ->
@@ -113,36 +110,6 @@ struct
           else
             Directory {d with fs_map = (update_map_name d.fs_map next_in_path nfs)}))
 
-  let rec rename fs o_path old_name n_path new_name =
-    match fs with
-    | File _      -> fs
-    | Directory d ->
-      (match o_path, n_path with
-      | [], [] -> 
-        (match Map_names.find_opt old_name d.fs_map with
-        | None -> Directory d
-        | Some tmp_fs ->
-          let new_map = Map_names.add new_name tmp_fs d.fs_map in
-          let new_map = Map_names.remove old_name new_map in
-          Directory {d with fs_map = new_map})
-      | o_next_in_path :: o_tl_path, n_next_in_path :: n_tl_path ->
-        if not (o_next_in_path = n_next_in_path)
-        then fs
-        else 
-          (match Map_names.find_opt o_next_in_path d.fs_map with
-          | None        -> fs
-          | Some sub_fs ->
-            let nfs = rename sub_fs o_tl_path old_name n_tl_path new_name in
-            if nfs = sub_fs
-            then fs
-            else
-              let new_map = Map_names.remove o_next_in_path d.fs_map in
-              let new_map = Map_names.add o_next_in_path nfs new_map in
-              Directory {d with fs_map = new_map})
-      | _ , _ -> fs)
-    | _ -> fs
-    
-
   let rec touch fs path new_file_name perm =
     match fs with
     | File _      -> fs
@@ -189,7 +156,7 @@ struct
     match c with
     | File_exists (path) -> Res (bool, Sys.file_exists (p path))
     | Mkdir (path, new_dir_name, perm) ->
-      Res (result unit exn, protect (Sys.mkdir ((p path) / new_dir_name))perm)
+      Res (result unit exn, protect (Sys.mkdir ((p path) / new_dir_name)) perm)
     | Rmdir (path, delete_dir_name) ->
       Res (result unit exn, protect (Sys.rmdir) ((p path) / delete_dir_name))
     | Readdir (path) ->