Merge pull request #17 from paurkedal/make_error

Add a constructor for the now abstract error type.
andersfugmann · Apr 19, 2019 · 73396aa · 73396aa
2 parents fbd2ebe + 77158c2
commit 73396aa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/drivers/generic/ppx_protocol_driver.ml b/drivers/generic/ppx_protocol_driver.ml
@@ -73,6 +73,8 @@ module Make(Driver: Driver)(P: Parameters) = struct
   type error = string * t option
   exception Protocol_error of error
 
+  let make_error ?value msg = (msg, value)
+
   let error_to_string_hum: error -> string = function
     | (s, Some t) -> Printf.sprintf "%s. Got: %s" s (Driver.to_string_hum t)
     | (s, None) -> s

diff --git a/drivers/xml_light/xml_light.ml b/drivers/xml_light/xml_light.ml
@@ -6,6 +6,8 @@ type t = Xml.xml
 type error = string * t option
 exception Protocol_error of error
 
+let make_error ?value msg = (msg, value)
+
 let to_string_hum xml = Xml.to_string_fmt xml
 
 let error_to_string_hum: error -> string = function

diff --git a/ppx/test/test_driver.ml b/ppx/test/test_driver.ml
@@ -22,6 +22,8 @@ type t =
 type error = string * t option
 exception Protocol_error of error
 
+let make_error ?value msg = (msg, value)
+
 let to_string_hum t = sexp_of_t t |> Sexp.to_string_hum
 let error_to_string_hum: error -> string = function
   | (s, Some t) -> Printf.sprintf "%s. T: '%s'" s (to_string_hum t)

diff --git a/runtime/runtime.ml b/runtime/runtime.ml
@@ -53,6 +53,9 @@ module type Driver = sig
       this is the only exception raised when deserializing *)
   exception Protocol_error of error
 
+  (** Construct an error to be raised from a custom parser. *)
+  val make_error: ?value: t -> string -> error
+
   (** Convert an error type to a human readable string *)
   val error_to_string_hum: error -> string