Used new OCaml 4.12 C-macros

Author: mmottl

dune-project

@@ -23,7 +23,7 @@ sqlite3-ocaml is an OCaml library with bindings to the SQLite3 client API.
 Sqlite3 is a self-contained, serverless, zero-configuration, transactional SQL
 database engine with outstanding performance for many use cases.")
   (depends
-    (ocaml (>= 4.06))
+    (ocaml (>= 4.12))
     dune-configurator
     (conf-sqlite3 :build)
     (ppx_inline_test :with-test)

sqlite3.opam

@@ -17,7 +17,7 @@ doc: "https://mmottl.github.io/sqlite3-ocaml/api"
 bug-reports: "https://github.com/mmottl/sqlite3-ocaml/issues"
 depends: [
   "dune" {>= "2.7"}
-  "ocaml" {>= "4.06"}
+  "ocaml" {>= "4.12"}
   "dune-configurator"
   "conf-sqlite3" {build}
   "ppx_inline_test" {with-test}

src/sqlite3_stubs.c

@@ -109,18 +109,8 @@ static int pthread_setspecific(pthread_key_t key, void *value)
 
 /* Utility definitions */
 
-static const value Val_None = Val_int(0);
-
-static inline value Val_Some(value v_arg)
-{
-  CAMLparam1(v_arg);
-  value v_res = caml_alloc_small(1, 0);
-  Field(v_res, 0) = v_arg;
-  CAMLreturn(v_res);
-}
-
 static inline value Val_string_option(const char *str)
-{ return (str == NULL) ? Val_None : Val_Some(caml_copy_string(str)); }
+{ return (str == NULL) ? Val_none : caml_alloc_some(caml_copy_string(str)); }
 
 
 /* Type definitions */
@@ -340,14 +330,8 @@ static inline value copy_string_option_array(const char** strs, int len)
 
     for (i = 0; i < len; ++i) {
       const char *str = strs[i];
-      if (str == NULL) Field(v_res, i) = Val_None;
-      else {
-        value v_opt;
-        v_str = caml_copy_string(str);
-        v_opt = caml_alloc_small(1, 0);
-        Field(v_opt, 0) = v_str;
-        Store_field(v_res, i, v_opt);
-      }
+      if (str == NULL) Field(v_res, i) = Val_none;
+      else Store_field(v_res, i, caml_alloc_some(caml_copy_string(str)));
     }
 
     CAMLreturn(v_res);
@@ -483,7 +467,7 @@ CAMLprim value caml_sqlite3_open(
   char *file;
 
 #ifdef SQLITE_HAS_OPEN_V2
-  if (v_vfs_opt == Val_None) vfs = NULL;
+  if (Is_none(v_vfs_opt)) vfs = NULL;
   else {
     value v_vfs = Field(v_vfs_opt, 0);
     int vfs_len = caml_string_length(v_vfs) + 1;
@@ -499,7 +483,7 @@ CAMLprim value caml_sqlite3_open(
       Int_val(v_cache)
      )
     caml_failwith("SQLite3 version < 3.5 does not support open flags");
-  if (v_vfs_opt != Val_None)
+  if (Is_some(v_vfs_opt))
     caml_failwith("SQLite3 version < 3.5 does not support VFS modules");
 #endif
 
@@ -665,7 +649,7 @@ CAMLprim value caml_sqlite3_exec(value v_db, value v_maybe_cb, value v_sql)
   cbx.cbp = &v_cb;
   cbx.exn = &v_exn;
 
-  if (v_maybe_cb != Val_None) {
+  if (Is_some(v_maybe_cb)) {
     v_cb = Field(v_maybe_cb, 0);
     cb = exec_callback;
   }
@@ -947,9 +931,9 @@ CAMLprim value caml_sqlite3_prepare_tail(value v_stmt)
   if (stmtw->sql && stmtw->tail && *(stmtw->tail)) {
     db_wrap *dbw = stmtw->db_wrap;
     int tail_len = stmtw->sql_len - (stmtw->tail - stmtw->sql);
-    CAMLreturn(Val_Some(prepare_it(dbw, stmtw->tail, tail_len, loc)));
+    CAMLreturn(caml_alloc_some(prepare_it(dbw, stmtw->tail, tail_len, loc)));
   }
-  else CAMLreturn(Val_None);
+  else CAMLreturn(Val_none);
 }
 
 CAMLprim value caml_sqlite3_recompile(value v_stmt)
@@ -1391,7 +1375,7 @@ static inline value caml_sqlite3_wrap_values(int argc, sqlite3_value **args)
           v_res = Val_int(1);
           break;
         default:
-          v_res = Val_None;
+          v_res = Val_none;
       }
       Store_field(v_arr, i, v_res);
     }
@@ -1588,8 +1572,8 @@ CAMLprim value caml_sqlite3_create_aggregate_function(
     sqlite3_create_window_function(
       dbw->db, String_val(v_name), n_args, SQLITE_UTF8, param,
       caml_sqlite3_user_function_step, caml_sqlite3_user_function_final,
-      v_valuefn == Val_None ? NULL : caml_sqlite3_user_function_value,
-      v_inversefn == Val_None ? NULL : caml_sqlite3_user_function_inverse,
+      Is_none(v_valuefn) ? NULL : caml_sqlite3_user_function_value,
+      Is_none(v_inversefn) ? NULL : caml_sqlite3_user_function_inverse,
       NULL);
 #else
   rc = sqlite3_create_function(dbw->db, String_val(v_name),