Fix a nasty bug where the wrong pointer was passed to the C side.

[SXSI/xpathcomp.git] / src / common_stub.hpp

diff --git a/src/common_stub.hpp b/src/common_stub.hpp
index bfacdac..3e874b7 100644 (file)
--- a/src/common_stub.hpp
+++ b/src/common_stub.hpp
@@ -1,9 +1,9 @@
-#ifndef COMMON_STUB_H_
-#define COMMON_STUB_H_
+#ifndef COMMON_STUB_HPP_
+#define COMMON_STUB_HPP_
 
 extern "C" {
 #define CAML_NAME_SPACE
-#include <stdlib.h>
+
 #include <caml/mlvalues.h>
 #include <caml/alloc.h>
 #include <caml/memory.h>
@@ -11,10 +11,12 @@ extern "C" {
 #include <caml/fail.h>
 #include <caml/custom.h>
 #include <caml/bigarray.h>
-#include <stdio.h>
 }
-#include <iostream>
 #include <typeinfo>
+#include <cstdio>
+
+#define NoAlloc
+
 
 void register_custom_(char* name,
                      size_t size,
@@ -22,37 +24,40 @@ void register_custom_(char* name,
 
 value alloc_custom_(char* name);
 
+template <class X> X& Obj_val(value v)
+{
+  return * (X*) Data_custom_val(v);
+}
+
+template <class X> void sxsi_finalize_obj(X) {
+}
+
+template <class X> void sxsi_finalize_obj(X* x){
+  delete x;
+}
 
 template <class X> void sxsi_finalize_custom(value v)
 {
-  X * obj = * ((X **) Data_custom_val(v));
-  std::cerr << "Finalizing object: " << typeid(X).name() << std::endl;
-  std::cerr.flush();
-  delete obj;
+  sxsi_finalize_obj(Obj_val<X>(v));
 }
 
-template <class X> value sxsi_alloc_custom()
+template <class X> value
+sxsi_alloc_custom(void (*finalize)(value) = sxsi_finalize_custom<X>)
 {
   char * name = const_cast<char*>(typeid(X).name());
+
   value v = alloc_custom_(name);
   if (v == Val_unit) {
-    register_custom_(name, sizeof(X*), sxsi_finalize_custom<X>);
+    register_custom_(name, sizeof(X), finalize);
     v = alloc_custom_(name);
   };
   return v;
 }
 
-template <class X> X*& Obj_val(value v)
-{
-  //Cannot use Data_custom_val here, it is not a correct lvalue. :-(
-  return (X*&) Field(v,1);
-}
+void sxsi_raise_msg(const char * msg);
 
-void sxsi_raise_msg(char * msg);
+extern "C" value sxsi_cpp_init(value unit);
 
-extern "C" {
-value sxsi_cpp_init(value unit);
-}
 
 
 #endif