diff options
| -rw-r--r-- | lib/kernel/Path.ml | 36 | ||||
| -rw-r--r-- | lib/kernel/Path.mli | 3 | ||||
| -rw-r--r-- | test/integration/Registration.ml | 2 |
3 files changed, 21 insertions, 20 deletions
diff --git a/lib/kernel/Path.ml b/lib/kernel/Path.ml index 936704d..629a527 100644 --- a/lib/kernel/Path.ml +++ b/lib/kernel/Path.ml @@ -17,28 +17,30 @@ module Error = struct ("path" |=| Concepts.Value.String (to_string path)) let not_a_registry path = condition "not-a-registry" "The specified path did not point to a registry" + ("path" |=| Concepts.Value.String (to_string path)) + + let not_a_directory path = condition "not-a-directory" "The specified path did not point to a directory" ("path" |=| Concepts.Value.String (to_string path)) end -let rec lookup handle = function - | [] -> Ok (Some handle) - | x::xs -> - let open Utilities.Result in - let open Protocols in - match Protocols.Directory.from handle with - | None -> Ok None - | Some dir -> - let* elem = Directory.find dir x in - match elem with - | None -> Ok None - | Some elem -> lookup elem xs - -let lookup' handle path = lookup handle path - |> Result.map (Option.to_result ~none:(Error.path_not_found path)) - |> Result.join +let lookup handle path = + let rec walk handle = function + | [] -> Ok handle + | x::xs -> + let open Utilities.Result in + let open Protocols in + match Directory.from handle with + | None -> Error (Error.path_not_found path) + | Some dir -> + let* elem = Directory.find dir x in + match elem with + | None -> Error (Error.not_a_directory path) + | Some elem -> walk elem xs + in + walk handle path let update handle path key reference value = let open Utilities.Result in - let* handle = lookup' handle path in + let* handle = lookup handle path in let* registry = Protocols.Registry.from handle |> Option.to_result ~none:(Error.not_a_registry path) in Protocols.Registry.update registry key reference value diff --git a/lib/kernel/Path.mli b/lib/kernel/Path.mli index e3eac9c..6a74350 100644 --- a/lib/kernel/Path.mli +++ b/lib/kernel/Path.mli @@ -3,7 +3,6 @@ type t val this : t val (@/) : string -> t -> t -val lookup : Protocols.Handle.t -> t -> (Protocols.Handle.t option, Concepts.Condition.condition) result -val lookup' : Protocols.Handle.t -> t -> (Protocols.Handle.t, Concepts.Condition.condition) result +val lookup : Protocols.Handle.t -> t -> (Protocols.Handle.t, Concepts.Condition.condition) result val update : Protocols.Handle.t -> t -> string -> Protocols.Handle.t option -> Protocols.Handle.t option -> (bool, Concepts.Condition.condition) result diff --git a/test/integration/Registration.ml b/test/integration/Registration.ml index f9d865f..413be9f 100644 --- a/test/integration/Registration.ml +++ b/test/integration/Registration.ml @@ -17,7 +17,7 @@ module Make (S : Abstract.Storage.STORAGE) (C : Helpers.Storage.CONFIGURATOR) = |> Helpers.condition_as_failure |> ignore; begin let* root = I.initialize conn in - Kernel.Path.(lookup' root ("branch" @/ "master" @/ "multigroup" @/ this)) + Kernel.Path.(lookup root ("branch" @/ "master" @/ "multigroup" @/ this)) end |> Helpers.condition_as_failure |> ignore |