Update custom_operations initialization

compare_ext (added in 3.12.1) now initialised with the default function. fixed_length optimisation implemented for 4.08+
andrenth · Oct 27, 2020 · e28ee25 · e28ee25
1 parent d56eb5f
commit e28ee25
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 4 deletions.
diff --git a/lib/int128_stubs.c b/lib/int128_stubs.c
@@ -10,6 +10,7 @@
 #include <caml/intext.h>
 #include <caml/memory.h>
 #include <caml/mlvalues.h>
+#include <caml/version.h>
 
 #include "uint128.h"
 #include "int128.h"
@@ -129,13 +130,21 @@ int128_deserialize(void *dst)
   return 16;
 }
 
+#if OCAML_VERSION_MAJOR > 4 || OCAML_VERSION_MAJOR == 4 && OCAML_VERSION_MINOR >= 8
+static const struct custom_fixed_length int128_length = { 16, 16 };
+#endif
+
 struct custom_operations int128_ops = {
   "stdint.int128",
   custom_finalize_default,
   int128_cmp,
   int128_hash,
   int128_serialize,
-  int128_deserialize
+  int128_deserialize,
+  custom_compare_ext_default
+#if OCAML_VERSION_MAJOR > 4 || OCAML_VERSION_MAJOR == 4 && OCAML_VERSION_MINOR >= 8
+  , &int128_length
+#endif
 };
 
 #ifdef HAVE_INT128

diff --git a/lib/uint128_stubs.c b/lib/uint128_stubs.c
@@ -10,6 +10,7 @@
 #include <caml/intext.h>
 #include <caml/memory.h>
 #include <caml/mlvalues.h>
+#include <caml/version.h>
 
 #include "int8.h"
 #include "int16.h"
@@ -171,13 +172,21 @@ uint128_deserialize(void *dst)
   return 16;
 }
 
+#if OCAML_VERSION_MAJOR > 4 || OCAML_VERSION_MAJOR == 4 && OCAML_VERSION_MINOR >= 8
+static const struct custom_fixed_length uint128_length = { 16, 16 };
+#endif
+
 struct custom_operations uint128_ops = {
   "stdint.uint128",
   custom_finalize_default,
   uint128_cmp,
   uint128_hash,
   uint128_serialize,
-  uint128_deserialize
+  uint128_deserialize,
+  custom_compare_ext_default
+#if OCAML_VERSION_MAJOR > 4 || OCAML_VERSION_MAJOR == 4 && OCAML_VERSION_MINOR >= 8
+  , &uint128_length
+#endif
 };
 
 #ifdef HAVE_UINT128

diff --git a/lib/uint32_stubs.c b/lib/uint32_stubs.c
@@ -8,6 +8,7 @@
 #include <caml/intext.h>
 #include <caml/memory.h>
 #include <caml/mlvalues.h>
+#include <caml/version.h>
 
 #include "uint32.h"
 
@@ -39,13 +40,21 @@ uint32_deserialize(void *dst)
     return 4;
 }
 
+#if OCAML_VERSION_MAJOR > 4 || OCAML_VERSION_MAJOR == 4 && OCAML_VERSION_MINOR >= 8
+static const struct custom_fixed_length uint32_length = { 4, 4 };
+#endif
+
 struct custom_operations uint32_ops = {
     "uint.uint32",
     custom_finalize_default,
     uint32_cmp,
     uint32_hash,
     uint32_serialize,
-    uint32_deserialize
+    uint32_deserialize,
+    custom_compare_ext_default
+#if OCAML_VERSION_MAJOR > 4 || OCAML_VERSION_MAJOR == 4 && OCAML_VERSION_MINOR >= 8
+  , &uint32_length
+#endif
 };
 
 CAMLprim value

diff --git a/lib/uint64_stubs.c b/lib/uint64_stubs.c
@@ -8,6 +8,7 @@
 #include <caml/intext.h>
 #include <caml/memory.h>
 #include <caml/mlvalues.h>
+#include <caml/version.h>
 
 #include "uint64.h"
 
@@ -39,13 +40,21 @@ uint64_deserialize(void *dst)
     return 8;
 }
 
+#if OCAML_VERSION_MAJOR > 4 || OCAML_VERSION_MAJOR == 4 && OCAML_VERSION_MINOR >= 8
+static const struct custom_fixed_length uint64_length = { 8, 8 };
+#endif
+
 struct custom_operations uint64_ops = {
     "uint.uint64",
     custom_finalize_default,
     uint64_cmp,
     uint64_hash,
     uint64_serialize,
-    uint64_deserialize
+    uint64_deserialize,
+    custom_compare_ext_default
+#if OCAML_VERSION_MAJOR > 4 || OCAML_VERSION_MAJOR == 4 && OCAML_VERSION_MINOR >= 8
+  , &uint64_length
+#endif
 };
 
 CAMLprim value