diff options
| author | Estevan Castilho <tevo@riajuu.net> | 2026-05-27 23:24:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-27 23:24:12 +0000 |
| commit | 9dc0391443ca16bf1ab3114d002aad83872f8a73 (patch) | |
| tree | e4f78a2533e5e633b733c1ea21d0159aeca79b75 /lib/qualified_name.ml | |
| parent | f9097a0562ea8b40d40a19059578a9280b945de4 (diff) | |
| download | Sakura-9dc0391443ca16bf1ab3114d002aad83872f8a73.tar.gz Sakura-9dc0391443ca16bf1ab3114d002aad83872f8a73.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | lib/qualified_name.ml | 10 | ||||
| -rw-r--r-- | lib/qualified_name.mli | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/qualified_name.ml b/lib/qualified_name.ml index 47134c8..a67f815 100644 --- a/lib/qualified_name.ml +++ b/lib/qualified_name.ml @@ -13,6 +13,12 @@ type t = { mg : string; name : string } +module Error = struct + open Condition + let unqualified_name name = condition "unqualified-name" "A qualified name was expected, but an unqualified one was given" + ("name" |=| (of_string name)) +end + exception Unqualified of string let parse (s : string) : t = @@ -24,8 +30,8 @@ let parse (s : string) : t = if mg = "" || name = "" then raise (Unqualified s) else { mg; name } -let try_parse (s : string) : (t, string) result = - try Ok (parse s) with Unqualified s -> Error s +let try_parse (s : string) : (t, Condition.t) result = + try Ok (parse s) with Unqualified s -> Error (Error.unqualified_name s) let make ~mg ~name = { mg; name } diff --git a/lib/qualified_name.mli b/lib/qualified_name.mli index 196dfbd..0e39ff2 100644 --- a/lib/qualified_name.mli +++ b/lib/qualified_name.mli @@ -11,7 +11,7 @@ val parse : string -> t (** Splits on the first [:]. Raises [Unqualified] when no mg segment is present (i.e. no colon, or empty mg / empty name). *) -val try_parse : string -> (t, string) result +val try_parse : string -> (t, Condition.t) result val make : mg:string -> name:string -> t |