Migrate the SCL over

2 files changed, 9 insertions, 21 deletions

diff --git a/lib/scl/executor.ml b/lib/scl/executor.ml
index 6848091..3785c4a 100644
--- a/lib/scl/executor.ml
+++ b/lib/scl/executor.ml
@@ -13,28 +13,22 @@ type exec_result =
 module Make (NT : Nt.S) = struct
   module DrlExec = Drl.Executor.Make (NT)
 
-  type error =
-    | ParseError of string
-    | QueryError of DrlExec.error
-    | CursorError of string
-
-  let sexp_of_error e =
-    let open Sexplib.Sexp in
-    match e with
-    | ParseError s -> List [ Atom "parse-error"; Atom s ]
-    | QueryError e -> DrlExec.sexp_of_error e
-    | CursorError s -> List [ Atom "cursor-error"; Atom s ]
+  module Error = struct
+    open Condition
+    (* TODO: more structure *)
+    let cursor_error msg = condition "cursor-error" ("message" |=| (of_string msg))
+  end
 
   let ( let* ) = Result.bind
 
   let execute (ctx : Sublanguage_context.t) (stmt : Ast.statement) :
-      (exec_result, error) result =
+      (exec_result, Condition.t) result =
     ignore default_batch;
     match stmt with
     | Ast.Begin _ ->
-        Error (CursorError "cursors not yet implemented")
+        Error (Error.cursor_error "cursors not yet implemented")
     | Ast.Fetch _ ->
-        Error (CursorError "cursors not yet implemented")
+        Error (Error.cursor_error "cursors not yet implemented")
     | Ast.Close _ ->
         let* () = Ok () in
         Ok (Closed ctx.branch#multigroups)
diff --git a/lib/scl/sublanguage.ml b/lib/scl/sublanguage.ml
index 87e4d42..0793211 100644
--- a/lib/scl/sublanguage.ml
+++ b/lib/scl/sublanguage.ml
@@ -3,15 +3,11 @@ module Make (NT : Nt.S) = struct
 
   type configuration = unit
   type ast = Ast.statement
-  type error = Exec.error
 
   let name = "scl"
   let parse _ = Ok ()
 
-  let parse_sexp sexp =
-    match Parser.of_sexp sexp with
-    | Ok r -> Ok r
-    | Error (Parser.ParseError s) -> Error (Exec.ParseError s)
+  let parse_sexp sexp = Parser.of_sexp sexp
 
   let execute ctx ast =
     Exec.execute ctx ast
@@ -19,6 +15,4 @@ module Make (NT : Nt.S) = struct
          | Executor.Batch { cursor_id; rows; has_more } ->
              Sublanguage_types.Cursor { cursor_id; rows; has_more }
          | Executor.Closed delta -> Sublanguage_types.Transition delta)
-
-  let sexp_of_error = Exec.sexp_of_error
 end