Add a new data member max to integer_set

Signed-off-by: yamacir-kit <[email protected]>

CMakeLists.txt

@@ -22,8 +22,8 @@ string(JOIN " " AGGRESSIVE_OPTIMIZATION_OPTIONS
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_FLAGS_DEBUG "-Og -gdwarf-4") # NOTE: The `-gdwarf-4` option is set due to the following issues with Clang 14 and Valgrind versions below 3.20: https://bugzilla.mozilla.org/show_bug.cgi?id=1758782
 set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG")
-set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${AGGRESSIVE_OPTIMIZATION_OPTIONS}")
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -gdwarf-4 -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG ${AGGRESSIVE_OPTIMIZATION_OPTIONS}")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -gdwarf-4")
 set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wpedantic -pipe")
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

README.md

@@ -91,7 +91,7 @@ Procedures for each standard are provided by the following R7RS-style libraries:
 cmake -B build -DCMAKE_BUILD_TYPE=Release
 cd build
 make package
-sudo apt install build/meevax_0.5.156_amd64.deb
+sudo apt install build/meevax_0.5.157_amd64.deb
 ```
 
 or
@@ -123,9 +123,9 @@ sudo rm -rf /usr/local/share/meevax
 
 | Target Name | Description
 |-------------|-------------
-| `all`       | Build shared-library `libmeevax.0.5.156.so` and executable `meevax`
+| `all`       | Build shared-library `libmeevax.0.5.157.so` and executable `meevax`
 | `test`      | Test executable `meevax`
-| `package`   | Generate debian package `meevax_0.5.156_amd64.deb`
+| `package`   | Generate debian package `meevax_0.5.157_amd64.deb`
 | `install`   | Copy files into `/usr/local` directly
 
 ## Usage

VERSION

@@ -1 +1 @@
-0.5.156
+0.5.157

include/meevax/memory/collector.hpp

@@ -161,7 +161,7 @@ inline namespace memory
     {
       using base_pointer = nan_boxing_pointer<Top, Ts...>;
 
-      mutator(std::nullptr_t = nullptr)
+      mutator(std::nullptr_t = nullptr) noexcept
       {}
 
       mutator(mutator const& other)
@@ -191,7 +191,10 @@ inline namespace memory
 
       ~mutator()
       {
-        mutators.erase(this);
+        if (not cleared)
+        {
+          mutators.erase(this);
+        }
       }
 
       auto operator =(mutator const& other) -> auto &

include/meevax/memory/integer_set.hpp

@@ -46,10 +46,14 @@ inline namespace memory
 
     subset * data[N] = {};
 
+    std::size_t max = 0;
+
     struct const_iterator : public std::iterator<std::bidirectional_iterator_tag, T>
     {
       subset const* const* data = nullptr;
 
+      std::size_t max = 0;
+
       std::size_t i = std::numeric_limits<std::size_t>::max();
 
       typename subset::const_iterator iter;
@@ -58,6 +62,7 @@ inline namespace memory
 
       explicit const_iterator(integer_set const* container, std::size_t i, std::uintptr_t j = 0) noexcept
         : data { container->data }
+        , max  { container->max }
         , i    { i }
       {
         assert(i <= N);
@@ -66,6 +71,7 @@ inline namespace memory
 
       explicit const_iterator(integer_set const* container) noexcept
         : data { container->data }
+        , max  { container->max }
         , i    { N }
       {
         decrement_unless_truthy();
@@ -82,13 +88,15 @@ inline namespace memory
           {
             return;
           }
-          else for (++i; good(); ++i)
+          else for (++i; i <= max; ++i)
           {
             if (data[i] and (iter = data[i]->lower_bound(0)).good())
             {
               return;
             }
           }
+
+          i = N;
         }
 
         iter = {};
@@ -209,6 +217,7 @@ inline namespace memory
       }
       else
       {
+        max = std::max(max, i);
         data[i] = new subset();
         data[i]->insert(j);
       }