Permalink
Browse files

[fix] build: plugins compilation (badop)

  • Loading branch information...
1 parent b8c8e35 commit c7069ac4daaf057dfdb76cf07896c612306fc680 @BourgerieQuentin BourgerieQuentin committed Aug 6, 2012
@@ -1,3 +1,4 @@
+bslUtils.ml
badop_engine.ml
badoplink.ml
opa_transaction.ml
@@ -21,16 +21,9 @@
##extern-type time_t = int
##property[endmli]
-##opa-type list('a)
-##opa-type tuple_2('a, 'b)
-##opa-type outcome('a, 'b)
-module BslNativeLib = OpabslMLRuntime.BslNativeLib
-module BslUtils = OpabslMLRuntime.BslUtils
-let opa_list_to_ocaml_list f l =
- BslNativeLib.opa_list_to_ocaml_list f
- (BslNativeLib.wrap_opa_list (unwrap_opa_list l))
-let create_outcome x =
- wrap_opa_outcome (BslUtils.unwrap_opa_outcome (BslUtils.create_outcome x))
+module BslNativeLib = BslUtils
+let opa_list_to_ocaml_list = BslUtils.opa_list_to_ocaml_list
+let create_outcome x = BslUtils.create_outcome x
(** *****************************)
module D = Badop.Dialog
@@ -12,8 +12,7 @@
(* ================================================================ *)
(** Low-level transaction handling for the database -- *)
(* ================================================================ *)
-module BslNativeLib = Badop_engine.BslNativeLib
-module BslUtils = Badop_engine.BslUtils
+module BslNativeLib = BslUtils
module B = Badoplink
module C = QmlCpsServerLib
@@ -172,18 +171,18 @@ let continue t f errh k =
##register [opacapi;cps-bypass] commit: t, continuation(opa[outcome(void,void)]) -> void
-let opa_success : (ServerLib.ty_void, ServerLib.ty_void) Badop_engine.opa_outcome =
+let opa_success : (ServerLib.ty_void, ServerLib.ty_void) BslUtils.opa_outcome =
let fld = ServerLib.static_field_of_name "success" in
let fields = ServerLib.empty_record_constructor in
let fields = ServerLib.add_field fields fld ServerLib.void in
let record = ServerLib.make_record fields in
- Badop_engine.wrap_opa_outcome record
-let opa_failure : (ServerLib.ty_void, ServerLib.ty_void) Badop_engine.opa_outcome =
+ BslUtils.wrap_opa_outcome record
+let opa_failure : (ServerLib.ty_void, ServerLib.ty_void) BslUtils.opa_outcome =
let fld = ServerLib.static_field_of_name "failure" in
let fields = ServerLib.empty_record_constructor in
let fields = ServerLib.add_field fields fld ServerLib.void in
let record = ServerLib.make_record fields in
- Badop_engine.wrap_opa_outcome record
+ BslUtils.wrap_opa_outcome record
let opa_outcome b = if b then opa_success else opa_failure
@@ -12,7 +12,7 @@
(** Database paths handling (high-level, low level ones are in Badoplink) *)
(* TODO: move all operations using the engine directly to badoplink *)
-module BslNativeLib = Badop_engine.BslNativeLib
+module BslNativeLib = BslUtils
module B = Badoplink
module C = QmlCpsServerLib
module D = Badop.Dialog
@@ -57,15 +57,15 @@ let ( @* ) f g x = f(g(x))
let nil_record = ServerLib.make_simple_record (BslNativeLib.field_nil)
let qml_nil () =
- Badop_engine.wrap_opa_list nil_record
+ BslUtils.wrap_opa_list nil_record
let qml_cons x l =
let record =
ServerLib.make_record
(ServerLib.add_field
(ServerLib.add_field ServerLib.empty_record_constructor BslNativeLib.field_hd x)
BslNativeLib.field_tl l)
- in Badop_engine.wrap_opa_list record
+ in BslUtils.wrap_opa_list record
let qml_pair x y =
let record =
@@ -74,7 +74,7 @@ let qml_pair x y =
(ServerLib.add_field ServerLib.empty_record_constructor
BslNativeLib.f1 x)
BslNativeLib.f2 y)
- in Badop_engine.wrap_opa_tuple_2 record
+ in BslUtils.wrap_opa_tuple_2 record
(* We need to handle map types (with values passed to dbgen) *)
##opa-type map('keys,'values)

0 comments on commit c7069ac

Please sign in to comment.