3 files changed, 37 insertions, 1 deletions
diff --git a/lib/icl/executor.ml b/lib/icl/executor.ml
index a895135..591f839 100644
--- a/lib/icl/executor.ml
+++ b/lib/icl/executor.ml
@@ -2,8 +2,16 @@ module Make (Storage : Management.Physical.S) = struct
   module Ops = Manipulation.Make(Storage)
 
   type error =
+    | ParseError        of string
     | ManipulationError of Manipulation.error
-    | ConversionError of string
+    | ConversionError   of string
+
+  let sexp_of_error e =
+    let open Sexplib.Sexp in
+    match e with
+    | ParseError s        -> List [Atom "parse-error";      Atom s]
+    | ManipulationError e -> Manipulation.sexp_of_error e
+    | ConversionError s   -> List [Atom "conversion-error"; Atom s]
 
   let wrap_manip = Result.map_error (fun e -> ManipulationError e)
 
diff --git a/lib/icl/parser.ml b/lib/icl/parser.ml
index a7981c0..28f8b6c 100644
--- a/lib/icl/parser.ml
+++ b/lib/icl/parser.ml
@@ -1,5 +1,10 @@
 type error = ParseError of string
 
+let of_sexp sexp =
+  match Ast.statement_of_sexp sexp with
+  | stmt          -> Ok stmt
+  | exception exn -> Error (ParseError (Printexc.to_string exn))
+
 let of_string s =
   match Sexplib.Sexp.of_string s |> Ast.statement_of_sexp with
   | stmt          -> Ok stmt
diff --git a/lib/icl/sublanguage.ml b/lib/icl/sublanguage.ml
new file mode 100644
index 0000000..4e74082
--- /dev/null
+++ b/lib/icl/sublanguage.ml
@@ -0,0 +1,23 @@
+module Make (Storage : Management.Physical.S) = struct
+  module Exec = Executor.Make(Storage)
+
+  type storage = Storage.t
+  type ast     = Ast.statement
+  type error   = Exec.error
+
+  let name = "icl"
+
+  let parse_sexp sexp =
+    match Parser.of_sexp sexp with
+    | Ok r -> Ok r
+    | Error (Parser.ParseError s) -> Error (Exec.ParseError s)
+
+  let execute storage db ast =
+    match Exec.execute storage db ast with
+    | Ok (db, msg) -> Ok (Sublanguage.Transition (db, msg))
+    | Error e -> Error e
+
+  let sexp_of_error = Exec.sexp_of_error
+end
+
+module Memory = Make(Management.Physical.Memory)