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/vcl/executor.ml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'lib/vcl/executor.ml') diff --git a/lib/vcl/executor.ml b/lib/vcl/executor.ml index 5f3dd49..4ac5eff 100644 --- a/lib/vcl/executor.ml +++ b/lib/vcl/executor.ml @@ -1,21 +1,11 @@ module Make (NT : Nt.S) = struct - type error = - | ParseError of string - | NtError of Nt.error - - let sexp_of_error e = - let open Sexplib.Sexp in - match e with - | ParseError s -> List [ Atom "parse-error"; Atom s ] - | NtError e -> List [ Atom "nt-error"; Atom (Nt.string_of_error e) ] - let execute (ctx : Sublanguage_context.t) (stmt : Ast.statement) : - (Sublanguage_types.result, error) result = + (Sublanguage_types.result, Condition.t) result = match stmt with | Ast.Use branch_name -> - match ctx.switch_branch branch_name with - | Ok delta -> Ok (Sublanguage_types.Transition delta) - | Error e -> Error (NtError e) + Result.map + (fun delta -> Sublanguage_types.Transition delta) + (ctx.switch_branch branch_name) let _ = (module NT : Nt.S) end -- cgit v1.2.3