update postcond match -> more readable

Author: Lucccyo

src/sys/stm_tests.ml

@@ -172,61 +172,69 @@ struct
     let p path = static_path / "sandbox_root" / (String.concat "/" path) in
     match c, res with
     | File_exists (path), Res ((Bool,_),b) -> b = mem fs path
-    | Mkdir (path, new_dir_name, _perm), Res ((Result (Unit,Exn),_), Error (Sys_error (s) ))
-      when s = (p (path @ [new_dir_name])) ^ ": Permission denied" -> true
-    | Mkdir (path, new_dir_name, _perm), Res ((Result (Unit,Exn),_), Error (Sys_error (s) ))
-      when s = (p (path @ [new_dir_name])) ^ ": File exists" -> mem fs (path @ [new_dir_name])
-    | Mkdir (path, new_dir_name, _perm), Res ((Result (Unit,Exn),_), Error (Sys_error (s) ))
-      when s = (p (path @ [new_dir_name])) ^ ": No such file or directory" -> not (mem fs path)
-    | Mkdir (path, new_dir_name, _perm), Res ((Result (Unit,Exn),_), Error (Sys_error (s) ))
-      when s = (p (path @ [new_dir_name])) ^ ": Not a directory" ->
-      (match find_opt fs (path @ [new_dir_name]) with
-      | None -> true
-      | Some target_fs -> not (is_a_dir target_fs))
-    | Mkdir (path, new_dir_name, _perm), Res ((Result (Unit,Exn),_), Ok ()) ->
-      let is_existing_is_a_dir =
-        (match find_opt fs path with
-        | None -> false
-        | Some target_fs -> is_a_dir target_fs) in
-      true && not (mem fs (path @ [new_dir_name])) && mem fs path && is_existing_is_a_dir
-    | Mkdir (_path, _new_dir_name, _perm), Res ((Result (Unit,Exn),_), _) -> false
-    | Rmdir (path, delete_dir_name), Res ((Result (Unit,Exn),_), Error (Sys_error (s) ))
-      when s = (p (path @ [delete_dir_name])) ^ ": No such file or directory" ->
-      not (mem fs (path @ [delete_dir_name]))
-    | Rmdir (path, delete_dir_name), Res ((Result (Unit,Exn),_), Error (Sys_error (s) ))
-      when s = (p (path @ [delete_dir_name])) ^ ": Directory not empty" ->
-      not (readdir fs (path @ [delete_dir_name]) = Some [])
-    | Rmdir (path, delete_dir_name), Res ((Result (Unit,Exn),_), Error (Sys_error (s) ))
-      when s = (p (path @ [delete_dir_name])) ^ ": Not a directory" ->
-      (match find_opt fs (path @ [delete_dir_name]) with
-      | None -> true
-      | Some target_fs -> not (is_a_dir target_fs))
-    | Rmdir (path, delete_dir_name), Res ((Result (Unit,Exn),_), Ok ()) ->
-      let is_empty = readdir fs (path @ [delete_dir_name]) = Some [] in
-      let is_a_dir =
-        (match find_opt fs (path @ [delete_dir_name]) with
-        | None -> false
-        | Some target_fs -> is_a_dir target_fs) in
-      mem fs (path @ [delete_dir_name]) && is_empty && is_a_dir
-    | Rmdir (_path, _delete_dir_name), Res ((Result (Unit,Exn),_), _r) -> false
-    | Readdir (path), Res ((Result (Array String,Exn),_), Error (Sys_error (s) ))
-      when s = (p path) ^ ": Permission denied" -> true
-    | Readdir (path), Res ((Result (Array String,Exn),_), Error (Sys_error (s) ))
-      when s = (p path) ^ ": No such file or directory" ->
-      not (mem fs path)
-    | Readdir (path), Res ((Result (Array String,Exn),_), Error (Sys_error (s) ))
-      when s = (p path) ^ ": Not a directory" ->
-      (match find_opt fs path with
-      | None -> true
-      | Some target_fs -> not (is_a_dir target_fs))
-    | Readdir (path), Res ((Result (Array String,Exn),_), r) ->
-     (match r with
-      | Error _ -> false
-      | Ok a     ->
-        let sut   = List.sort (fun a b -> -(String.compare a b)) (Array.to_list a) in
-        (match readdir fs path with
-          | None   -> false
-          | Some l -> List.sort (fun a b -> -(String.compare a b)) l = sut))
+    | Mkdir (path, new_dir_name, _perm), Res ((Result (Unit,Exn),_), res) ->
+      let complete_path = (path @ [new_dir_name]) in
+      (match res with
+       | Error err ->
+         (match err with
+           | Sys_error s ->
+             (s = (p complete_path) ^ ": Permission denied") ||
+             (s = (p complete_path) ^ ": File exists" && mem fs complete_path) ||
+             (s = (p complete_path) ^ ": No such file or directory" && not (mem fs path)) ||
+             (s = (p complete_path) ^ ": Not a directory" &&
+              (match find_opt fs complete_path with
+              | None -> true
+              | Some target_fs -> not (is_a_dir target_fs)))
+           | _ -> false)
+        | Ok () ->
+         let is_existing_is_a_dir =
+           (match find_opt fs path with
+            | None -> false
+            | Some target_fs -> is_a_dir target_fs) in
+         not (mem fs complete_path) && mem fs path && is_existing_is_a_dir)
+    | Rmdir (path, delete_dir_name), Res ((Result (Unit,Exn),_), res) ->
+      let complete_path = (path @ [delete_dir_name]) in
+      (match res with
+       | Error err ->
+         (match err with
+           | Sys_error s ->
+             (s = (p complete_path) ^ ": Directory not empty" && not (readdir fs complete_path = Some [])) ||
+             (s = (p complete_path) ^ ": No such file or directory" && not (mem fs complete_path)) ||
+             (s = (p complete_path) ^ ": Not a directory" &&
+              (match find_opt fs complete_path with
+              | None -> true
+              | Some target_fs -> not (is_a_dir target_fs)))
+           | _ -> false)
+        | Ok () ->
+          let is_empty = readdir fs complete_path = Some [] in
+          let is_a_dir =
+            (match find_opt fs complete_path with
+            | None -> false
+            | Some target_fs -> is_a_dir target_fs) in
+          mem fs complete_path && is_empty && is_a_dir)
+    | Readdir (path), Res ((Result (Array String,Exn),_), res) ->
+      (match res with
+       | Error err ->
+         (match err with
+           | Sys_error s ->
+             (s = (p path) ^ ": Permission denied") ||
+             (s = (p path) ^ ": No such file or directory" && not (mem fs path)) ||
+             (s = (p path) ^ ": Not a directory" &&
+              (match find_opt fs path with
+              | None -> true
+              | Some target_fs -> not (is_a_dir target_fs)))
+           | _ -> false)
+        | Ok array_of_subdir ->
+          let sut = List.sort (fun a b -> -(String.compare a b)) (Array.to_list array_of_subdir) in
+          let same_result =
+            (match readdir fs path with
+            | None   -> false
+            | Some l -> List.sort (fun a b -> -(String.compare a b)) l = sut) in
+          let is_a_dir =
+            (match find_opt fs path with
+            | None -> true
+            | Some target_fs -> is_a_dir target_fs) in
+          same_result && mem fs path && is_a_dir)
     | Touch (_path, _new_dir_name, _perm), Res ((Unit,_),_) -> true
     | _,_ -> false
 end