From 9dc0391443ca16bf1ab3114d002aad83872f8a73 Mon Sep 17 00:00:00 2001 From: Estevan Castilho Date: Wed, 27 May 2026 23:24:12 +0000 Subject: Improve the error handling situation (#71) * Sketches of a condition system * `Condition.condition` -> `Condition.t` * Migrate `NT` over * Migrate `Branch` over * Migrate `Sublanguage` et al. over * Migrate the PRL over * Migrate the DRL over * Migrate the DML over * Have `Qualified_name.try_parse` return a `Condition.t` * Migrate the DDL over * Migrate the VCL over * Migrate the SCL over * Migrate the ICL over * Migrate the parsers over * Just inherit the errors from NT and the sublanguages * Migrate `Management.Physical` over * Migrate `Configuration` over * Migrate `Management.Branch` over * Migrate `Transport` over * Migrate `System` over * Migrate `Server` over * Include messages on on all conditions * A prettier stringifier --- lib/transport.ml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib/transport.ml') diff --git a/lib/transport.ml b/lib/transport.ml index b541e16..4ed9743 100644 --- a/lib/transport.ml +++ b/lib/transport.ml @@ -20,6 +20,12 @@ module TCP : TRANSPORT = struct type t = Unix.file_descr type connection = Unix.file_descr + module Error = struct + open Condition + (* TODO: more structure *) + let parse_error msg = condition "parse-error" msg empty + end + let sockaddr_of_fields = function | `Inet (addr, port) -> Ok @@ -50,8 +56,8 @@ module TCP : TRANSPORT = struct | bad :: _ -> errorf "transport/tcp: unexpected: %s" (to_string bad) in match sexp with - | List children -> go None None None children - | _ -> Error "transport/tcp: expected a list of fields" + | List children -> go None None None children |> Result.map_error Error.parse_error + | _ -> Error (Error.parse_error "transport/tcp: expected a list of fields") let string_of_sockaddr = function | Unix.ADDR_INET (host, port) -> -- cgit v1.2.3