cl_{GV,SV}: use std::size_t for size of vectors (instead of obscure uintC).

[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 7a65eb910735612c6d717f72c924c4068e84f043..fecf25fc0b65c67f302f4068c3e53a24c4a5b83c 100644 (file)
--- a/src/vector/cl_GV_number.cc
+++ b/src/vector/cl_GV_number.cc
@@ -1,9 +1,7 @@
 // cl_make_heap_GV_number().
 
 // General includes.
-#include "cl_sysdep.h"
-
-CL_PROVIDE(cl_GV_number)
+#include "base/cl_sysdep.h"
 
 // Specification.
 #include "cln/GV_number.h"
@@ -12,7 +10,7 @@ CL_PROVIDE(cl_GV_number)
 // Implementation.
 
 #include "cln/exception.h"
-#include "cl_offsetof.h"
+#include "base/cl_offsetof.h"
 
 namespace cln {
 
@@ -25,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)
 {
@@ -53,33 +56,33 @@ struct cl_heap_GV_number_general : public cl_heap_GV_number {
        cl_heap_GV_number_general ();
 };
 
-static const cl_number general_element (const cl_GV_inner<cl_number>* vec, uintC index)
+static const cl_number general_element (const cl_GV_inner<cl_number>* vec, std::size_t index)
 {
        return ((const cl_heap_GV_number_general *) outcast(vec))->data[index];
 }
 
-static void general_set_element (cl_GV_inner<cl_number>* vec, uintC index, const cl_number& x)
+static void general_set_element (cl_GV_inner<cl_number>* vec, std::size_t index, const cl_number& x)
 {
        ((cl_heap_GV_number_general *) outcast(vec))->data[index] = x;
 }
 
 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 uintC len = hv->v.length();
-       for (var uintC i = 0; i < len; i++)
+       cl_heap_GV_number_general* hv = (cl_heap_GV_number_general *) outcast(vec);
+       std::size_t len = hv->v.size();
+       for (std::size_t i = 0; i < len; i++)
                hv->data[i].~cl_number();
 }
 
-static void general_copy_elements (const cl_GV_inner<cl_number>* srcvec, uintC srcindex, cl_GV_inner<cl_number>* destvec, uintC destindex, uintC count)
+static void general_copy_elements (const cl_GV_inner<cl_number>* srcvec, std::size_t srcindex, cl_GV_inner<cl_number>* destvec, std::size_t destindex, std::size_t count)
 {
        if (count > 0) {
-               var const cl_heap_GV_number_general* srcv =
+               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* destv =
                  (cl_heap_GV_number_general *) outcast(destvec);
-               var uintC srclen = srcv->v.length();
-               var uintC destlen = destv->v.length();
+               std::size_t srclen = srcv->v.size();
+               std::size_t destlen = destv->v.size();
                if (!(srcindex <= srcindex+count && srcindex+count <= srclen))
                        throw runtime_exception();
                if (!(destindex <= destindex+count && destindex+count <= destlen))
@@ -90,27 +93,42 @@ static void general_copy_elements (const cl_GV_inner<cl_number>* srcvec, uintC s
        }
 }
 
-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 (uintC len)
+cl_heap_GV_number* cl_make_heap_GV_number (std::size_t len)
 {
-       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);
+       static cl_GV_vectorops<cl_number> general_vectorops = {
+               general_element,
+               general_set_element,
+               general_do_delete,
+               general_copy_elements
+       };
+
+       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 uintC i = 0; i < len; i++)
+       for (std::size_t 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((uintC)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((std::size_t)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)