wip rename

Author: Lucccyo

src/sys/dune

@@ -10,7 +10,7 @@
 (executable
  (name stm_tests)
  (modules stm_tests)
- (libraries STM)
+ (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess
   (pps ppx_deriving.show)))
 

src/sys/stm_tests.ml

@@ -1,25 +1,19 @@
 open QCheck
-open STM
+open STM_base
 
 module SConf =
 struct
-
   type cmd =
     | File_exists of string list
     | 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 }]
 
   module Map_names = Map.Make (String)
 
-  type permission = {
-    owner: int;
-    group: int;
-    other: int;
-  }
-
   type filesys =
     | Directory of {perm: int; fs_map: filesys Map_names.t}
     | File of {perm: int}
@@ -32,9 +26,10 @@ struct
 
   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
-    (* let perm_gen = Gen.map3 (fun d1 d2 d3 -> d1*100 + d2*10 + d3*1) (Gen.int_bound 7) (Gen.int_bound 7) (Gen.int_bound 7) in *)
     QCheck.make ~print:show_cmd
       Gen.(oneof
             [
@@ -57,13 +52,13 @@ struct
       if path = []
       then Some (File f)
       else None
-    | Directory d ->
-      (match path with
-      | []       -> Some (Directory d)
-      | hd :: tl ->
-        (match Map_names.find_opt hd d.fs_map with
-        | None    -> None
-        | Some fs -> find_opt fs tl))
+    | Directory d -> 
+        (match path with
+        | []       -> Some (Directory d)
+        | hd :: tl ->
+          (match Map_names.find_opt hd d.fs_map with
+          | None    -> None
+          | Some fs -> find_opt fs tl))
 
   let mem fs path =
     match find_opt fs path with
@@ -118,6 +113,36 @@ 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
@@ -245,13 +270,12 @@ struct
     | _,_ -> false
 end
 
-module SysSTM = STM.Make(SConf)
+module Sys_seq = STM_sequential.Make(SConf)
+module Sys_dom = STM_domain.Make(SConf)
 
-;;
-Util.set_ci_printing ()
 ;;
 QCheck_base_runner.run_tests_main
   (let count = 1000 in
-   [SysSTM.agree_test         ~count ~name:"STM Sys test sequential";
-   (* SysSTM.neg_agree_test_par ~count ~name:"STM Sys test parallel" *)
+   [Sys_seq.agree_test         ~count ~name:"STM Sys test sequential";
+   (* Sys_dom.neg_agree_test_par ~count ~name:"STM Sys test parallel" *)
 ])