bump library version, since CLN doesn't export global object ctors any more.

[cln.git] / src / vector / cl_GV_number.cc

diff --git a/src/vector/cl_GV_number.cc b/src/vector/cl_GV_number.cc
index 30d00eced468405d98f150433006b94cb19dc8b6..6c47891c908a31e546bdf2b01b83d6cac72a3049 100644 (file)
--- a/src/vector/cl_GV_number.cc
+++ b/src/vector/cl_GV_number.cc
@@ -3,17 +3,16 @@
 // General includes.
 #include "cl_sysdep.h"
 
-CL_PROVIDE(cl_GV_number)
-
 // Specification.
-#include "cl_GV_number.h"
+#include "cln/GV_number.h"
 
 
 // Implementation.
 
-#include "cl_abort.h"
+#include "cln/exception.h"
 #include "cl_offsetof.h"
 
+namespace cln {
 
 static void cl_gvector_number_destructor (cl_heap* pointer)
 {
@@ -24,11 +23,16 @@ static void cl_gvector_number_destructor (cl_heap* pointer)
 #endif
 }
 
-cl_class cl_class_gvector_number = {
-       cl_gvector_number_destructor,
-       0
-};
-
+// XXX: this ought to be const, but it would be impossible to register
+// the printing function (in cl_GV_number_debug.cc)
+cl_class& cl_class_gvector_number()
+{
+       static cl_class instance = {
+               cl_gvector_number_destructor,
+               0
+       };
+       return instance;
+}
 
 static inline cl_heap_GV_number * outcast (cl_GV_inner<cl_number>* vec)
 {
@@ -45,19 +49,19 @@ static inline const cl_heap_GV_number * outcast (const cl_GV_inner<cl_number>* v
 struct cl_heap_GV_number_general : public cl_heap_GV_number {
        cl_number data[1];
        // Standard allocation disabled.
-       void* operator new (size_t size) { unused size; cl_abort(); return (void*)1; }
+       void* operator new (size_t size) { unused size; throw runtime_exception(); }
        // Standard deallocation disabled.
-       void operator delete (void* ptr) { unused ptr; cl_abort(); }
+       void operator delete (void* ptr) { unused ptr; throw runtime_exception(); }
        // No default constructor.
        cl_heap_GV_number_general ();
 };
 
-static const cl_number general_element (const cl_GV_inner<cl_number>* vec, uintL index)
+static const cl_number general_element (const cl_GV_inner<cl_number>* vec, uintC index)
 {
        return ((const cl_heap_GV_number_general *) outcast(vec))->data[index];
 }
 
-static void general_set_element (cl_GV_inner<cl_number>* vec, uintL index, const cl_number& x)
+static void general_set_element (cl_GV_inner<cl_number>* vec, uintC index, const cl_number& x)
 {
        ((cl_heap_GV_number_general *) outcast(vec))->data[index] = x;
 }
@@ -65,49 +69,66 @@ static void general_set_element (cl_GV_inner<cl_number>* vec, uintL index, const
 static void general_do_delete (cl_GV_inner<cl_number>* vec)
 {
        var cl_heap_GV_number_general* hv = (cl_heap_GV_number_general *) outcast(vec);
-       var uintL len = hv->v.length();
-       for (var uintL i = 0; i < len; i++)
+       var uintC len = hv->v.length();
+       for (var uintC i = 0; i < len; i++)
                hv->data[i].~cl_number();
 }
 
-static void general_copy_elements (const cl_GV_inner<cl_number>* srcvec, uintL srcindex, cl_GV_inner<cl_number>* destvec, uintL destindex, uintL count)
+static void general_copy_elements (const cl_GV_inner<cl_number>* srcvec, uintC srcindex, cl_GV_inner<cl_number>* destvec, uintC destindex, uintC count)
 {
        if (count > 0) {
                var const cl_heap_GV_number_general* srcv =
                  (const cl_heap_GV_number_general *) outcast(srcvec);
                var cl_heap_GV_number_general* destv =
                  (cl_heap_GV_number_general *) outcast(destvec);
-               var uintL srclen = srcv->v.length();
-               var uintL destlen = destv->v.length();
+               var uintC srclen = srcv->v.length();
+               var uintC destlen = destv->v.length();
                if (!(srcindex <= srcindex+count && srcindex+count <= srclen))
-                       cl_abort();
+                       throw runtime_exception();
                if (!(destindex <= destindex+count && destindex+count <= destlen))
-                       cl_abort();
+                       throw runtime_exception();
                do {
                        destv->data[destindex++] = srcv->data[srcindex++];
                } while (--count > 0);
        }
 }
 
-static cl_GV_vectorops<cl_number> general_vectorops = {
-       general_element,
-       general_set_element,
-       general_do_delete,
-       general_copy_elements
-};
 
-cl_heap_GV_number* cl_make_heap_GV_number (uintL len)
+cl_heap_GV_number* cl_make_heap_GV_number (uintC len)
 {
-       var cl_heap_GV_number_general* hv = (cl_heap_GV_number_general*) cl_malloc_hook(offsetofa(cl_heap_GV_number_general,data)+sizeof(cl_number)*len);
+       static cl_GV_vectorops<cl_number> general_vectorops = {
+               general_element,
+               general_set_element,
+               general_do_delete,
+               general_copy_elements
+       };
+
+       var cl_heap_GV_number_general* hv = (cl_heap_GV_number_general*) malloc_hook(offsetofa(cl_heap_GV_number_general,data)+sizeof(cl_number)*len);
        hv->refcount = 1;
-       hv->type = &cl_class_gvector_number;
+       hv->type = &cl_class_gvector_number();
        new (&hv->v) cl_GV_inner<cl_number> (len,&general_vectorops);
-       for (var uintL i = 0; i < len; i++)
+       for (var uintC i = 0; i < len; i++)
                init1(cl_number, hv->data[i]) ();
        return hv;
 }
 
 // An empty vector.
-const cl_GV_number cl_null_GV_number = cl_GV_number((uintL)0);
+const cl_GV_number cl_null_GV_number = cl_null_GV_number;
+
+int cl_GV_number_init_helper::count = 0;
+
+cl_GV_number_init_helper::cl_GV_number_init_helper()
+{
+       if (count++ == 0)
+               new ((void *)&cl_null_GV_number) cl_GV_number((uintC)0);
+}
+
+cl_GV_number_init_helper::~cl_GV_number_init_helper()
+{
+       if (--count == 0) {
+               // Nothing to clean up
+       }
+}
+
+}  // namespace cln
 
-CL_PROVIDE_END(cl_GV_number)