debug sparkstack

algoim/sparkstack.hpp

@@ -10,22 +10,23 @@
 
 namespace algoim
 {
-    template<typename T, int N>
+template <typename T, int N>
-    class xarray;
+class xarray;
 
-    template<typename T>
+template <typename T>
-    class SparkStack
+class SparkStack
-    {
+{
     static constexpr size_t capacity      = 1u << 23;
     static constexpr int    capacity_line = __LINE__ - 1;
 
-        template<typename ...R>
+    template <typename... R>
     static size_t alloc(T** ptr, size_t len, R... rest)
     {
-            if (pos() + len > capacity)
+        if (pos() + len > capacity) {
-            {
+            std::cerr << "SparkStack<T = " << typeid(T).name() << ">: capacity=" << capacity << " and pos=" << pos()
-                std::cerr << "SparkStack<T = " << typeid(T).name() << ">: capacity=" << capacity << " and pos=" << pos() << " insufficient for request len=" << len << '\n';
+                      << " insufficient for request len=" << len << '\n';
-                std::cerr << "    consider increasing const 'capacity', defined on line " << capacity_line << " in file " << __FILE__ << '\n';
+            std::cerr << "    consider increasing const 'capacity', defined on line " << capacity_line << " in file "
+                      << __FILE__ << '\n';
             throw std::bad_alloc();
         }
         *ptr   = base() + pos();
@@ -55,10 +56,9 @@ namespace algoim
     SparkStack& operator=(const SparkStack&) = delete;
     SparkStack& operator=(SparkStack&&)      = delete;
 
-    public:
+public:
-
     // With parameters x0, n0, x1, n1, x2, n2, ..., allocate n0 elements and assign to x0, etc.
-        template<typename ...R>
+    template <typename... R>
     explicit SparkStack(T** ptr, size_t len, R&&... rest)
     {
         len_ = alloc(ptr, len, rest...);
@@ -66,43 +66,38 @@ namespace algoim
 
     // With parameters value, x0, n0, x1, n1, x2, n2, ..., allocate n0 elements and assign to x0, ...,
     // and assign the given value to all n0*n1*n2*... values allocated
-        template<typename ...R>
+    template <typename... R>
     explicit SparkStack(T value, T** ptr, size_t len, R&&... rest)
     {
         T* start = base() + pos();
         len_     = alloc(ptr, len, rest...);
-            for (int i = 0; i < len_; ++i)
+        for (int i = 0; i < len_; ++i) *(start + i) = value;
-                *(start + i) = value;
     }
 
     // For each i, allocate ext(i) elements and assign to ptr(i)
-        template<int N>
+    template <int N>
-        explicit SparkStack(uvector<T*,N>& ptr, const uvector<int,N>& ext)
+    explicit SparkStack(uvector<T*, N>& ptr, const uvector<int, N>& ext)
     {
         len_ = 0;
-            for (int i = 0; i < N; ++i)
+        for (int i = 0; i < N; ++i) len_ += alloc(&ptr(i), ext(i));
-                len_ += alloc(&ptr(i), ext(i));
     }
 
     // Allocate enough elements for one or more xarray's having pre-set extent
-        template<int ...N>
+    template <int... N>
-        explicit SparkStack(xarray<T,N>&... a)
+    explicit SparkStack(xarray<T, N>&... a)
     {
         len_ = (alloc(&a.data_, a.size()) + ...);
     }
 
     // Release memory when the SparkStack object goes out of scope
-        ~SparkStack()
+    ~SparkStack() { pos() -= len_; }
-        {
+};
-            pos() -= len_;
+
-        }
+#define algoim_CONCAT2(x, y)                x##y
-    };
+#define algoim_CONCAT(x, y)                 algoim_CONCAT2(x, y)
-
+#define algoim_spark_alloc(T, ...)          SparkStack<T> algoim_CONCAT(spark_alloc_var_, __LINE__)(__VA_ARGS__)
-    #define algoim_CONCAT2(x, y) x ## y
+#define algoim_spark_alloc_def(T, val, ...) SparkStack<T> algoim_CONCAT(spark_alloc_var_, __LINE__)(val, __VA_ARGS__)
-    #define algoim_CONCAT(x, y) algoim_CONCAT2(x, y)
+#define algoim_spark_alloc_vec(T, ptr, ext) SparkStack<T> algoim_CONCAT(spark_alloc_var_, __LINE__)(ptr, ext)
-    #define algoim_spark_alloc(T, ...) SparkStack<T> algoim_CONCAT(spark_alloc_var_, __LINE__)(__VA_ARGS__)
-    #define algoim_spark_alloc_def(T, val, ...) SparkStack<T> algoim_CONCAT(spark_alloc_var_, __LINE__)(val, __VA_ARGS__)
-    #define algoim_spark_alloc_vec(T, ptr, ext) SparkStack<T> algoim_CONCAT(spark_alloc_var_, __LINE__)(ptr, ext)
 
 } // namespace algoim