diff options
Diffstat (limited to 'lib/kernel/Path.ml')
| -rw-r--r-- | lib/kernel/Path.ml | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/lib/kernel/Path.ml b/lib/kernel/Path.ml index b83c9b2..f34abe2 100644 --- a/lib/kernel/Path.ml +++ b/lib/kernel/Path.ml @@ -1,38 +1,42 @@ type t = string list let this = [] -let (@/) x y = x::y +let ( @/ ) x y = x :: y let to_string path = path |> List.map (fun x -> - let str = BatString.replace ~str:x ~sub:"^" ~by:"^^" |> snd in - BatString.replace ~str ~sub:"/" ~by:"^/" |> snd) + let str = BatString.replace ~str:x ~sub:"^" ~by:"^^" |> snd in + BatString.replace ~str ~sub:"/" ~by:"^/" |> snd ) |> BatIO.to_string (BatList.print ~first:"/" ~last:"" ~sep:"/" BatString.print) module Error = struct open Concepts.Condition - let path_not_found path = condition "path-not-found" "A given path was not found under the specified object" - ("path" |=| Concepts.Value.String (to_string path)) + let path_not_found path = + condition "path-not-found" "A given path was not found under the specified object" + ("path" |=| Concepts.Value.String (to_string path)) end let walking f g handle path = let rec walk handle = function | [] -> g handle - | x::xs -> - let open Utilities.Result in - let open Protocols in - let* dir = - Handle.require Directory.from handle - |> Result.map_error Concepts.Condition.(complement ("before-segment" |=| Concepts.Value.String x)) in - let* elem = Directory.find dir x in - match elem with - | None -> Error (Error.path_not_found path) - | Some elem -> f x handle (fun () -> walk elem xs) + | x :: xs -> ( + let open Utilities.Result in + let open Protocols in + let* dir = + Handle.require Directory.from handle + |> Result.map_error + Concepts.Condition.(complement ("before-segment" |=| Concepts.Value.String x)) + in + let* elem = Directory.find dir x in + match elem with + | None -> Error (Error.path_not_found path) + | Some elem -> f x handle (fun () -> walk elem xs) ) in walk handle path - |> Result.map_error Concepts.Condition.(complement ("path" |=| Concepts.Value.String (to_string path))) + |> Result.map_error + Concepts.Condition.(complement ("path" |=| Concepts.Value.String (to_string path))) let lookup = walking (fun _ _ f -> f ()) Result.ok |
