fix: rewrite the core

bantorra.opam

@@ -13,14 +13,20 @@ dev-repo: "git+https://github.com/RedPRL/bantorra.git"
 depends: [
   "dune" {>= "2.0"}
   "ocaml" {>= "5.0"}
+  "asai"
+  "algaeff" {>= "0.2"}
   "bos" {>= "0.2"}
+  "bwd" {>= "2.1"}
   "conf-git" {post}
   "ezjsonm" {>= "1.2"}
+  "json-data-encoding" {>= "0.9"}
   "ocamlfind" {>= "1.8"}
   "odoc" {with-doc}
 ]
+pin-depends: [
+  [ "asai.0.1.0~dev" "git+https://github.com/RedPRL/asai" ]
+]
 build: [
-  ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "build" "-p" name "-j" jobs "@runtest"] {with-test}
   ["dune" "build" "-p" name "-j" jobs "@doc"] {with-doc}

src/basis/BantorraBasis.ml

@@ -2,24 +2,22 @@
 
 (** {1 Main Modules} *)
 
+module UnitPath = UnitPath
+(** Unit paths. *)
+
+module FilePath = FilePath
+(** Basic path manipulation. *)
+
 module File = File
-(** Basic I/O and path manipulation. *)
+(** Basic I/O. *)
 
 module Marshal = Marshal
 (** Serialization. *)
 
-(**/**)
+(** {1 Error Handling} *)
 
-(** {1 Helper Modules} *)
+module ErrorCode = ErrorCode
+(** Error codes. *)
 
 module Error = Error
-(** Generic error reporting functions. *)
-
-module Errors = Errors
-(** Specialized error reporting functions. *)
-
-module Util = Util
-(** Utility functions. *)
-
-module ResultMonad = ResultMonad
-(** The {!type:result} monad. *)
+(** Error reporting. *)

src/basis/Error.ml

@@ -1,20 +1 @@
-let[@inline] error_msg ~tag ~src msg =
-  Format.kasprintf tag "Reported from %s:\n  %s" src msg
-
-let error_msgf ~tag ~src =
-  Format.kasprintf (error_msg ~tag ~src)
-
-let append_tag ~tag ~earlier =
-  Format.kasprintf tag "%s\n%s" earlier
-
-let append_error_msg ~tag ~earlier =
-  error_msg ~tag:(append_tag ~tag ~earlier)
-
-let append_error_msgf ~tag ~earlier =
-  error_msgf ~tag:(append_tag ~tag ~earlier)
-
-let pp_lines fmt msg =
-  Format.fprintf fmt "@[<v>";
-  Format.(pp_print_list ~pp_sep:pp_print_cut pp_print_string) fmt @@
-  String.split_on_char '\n' msg;
-  Format.fprintf fmt "@]"
+include Asai.Logger.Make(ErrorCode)

src/basis/Error.mli

@@ -1,14 +1 @@
-val error_msg : tag:(string -> ('a, 'b) result) -> src:string -> string -> ('a, 'b) result
-(** Turn an error message into an error. *)
-
-val error_msgf : tag:(string -> ('a, 'b) result) -> src:string -> ('c, Format.formatter, unit, ('a, 'b) result) format4 -> 'c
-(** Format an error message. *)
-
-val append_error_msg : tag:(string -> ('a, 'b) result) -> earlier:string -> src:string -> string -> ('a, 'b) result
-(** Append an error message to an earlier error. *)
-
-val append_error_msgf : tag:(string -> ('a, 'b) result) -> earlier:string -> src:string -> ('c, Format.formatter, unit, ('a, 'b) result) format4 -> 'c
-(** Format and append an error message to an earlier error. *)
-
-val pp_lines : Format.formatter -> string -> unit
-(** Pretty printer that hints newlines for ['\n']. *)
+include Asai.Logger.S with module Code := ErrorCode

src/basis/ErrorCode.ml

@@ -0,0 +1,19 @@
+type t =
+  [ `System
+  | `AnchorNotFound
+  | `JSONFormat
+  | `UnitNotFound
+  | `InvalidLibrary
+  | `InvalidRouter
+  ]
+
+let default_severity _ = Asai.Severity.Error
+
+let to_string : t -> string =
+  function
+  | `System -> "sys"
+  | `AnchorNotFound -> "anchor"
+  | `JSONFormat -> "json"
+  | `UnitNotFound -> "unit"
+  | `InvalidLibrary -> "lib"
+  | `InvalidRouter -> "router"