added tests for poly

bemanproject · Jan 17, 2025 · ad682dc · ad682dc
1 parent 28708d0
commit ad682dc
Show file tree

Hide file tree

Showing 6 changed files with 347 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ BUILDDIR = build
 default: test
 
 compile: config
-	cmake --build $(BUILDDIR)
+	cmake --build $(BUILDDIR) -j
 
 format:
 	git clang-format main

diff --git a/include/beman/lazy/detail/lazy.hpp b/include/beman/lazy/detail/lazy.hpp
@@ -110,9 +110,9 @@ struct lazy {
                                                     ::beman::execution26::set_stopped_t()>;
 
     struct state_base {
-        virtual void            complete(lazy_promise_base<std::remove_cvref_t<T>>::result_t&) = 0;
-        virtual stop_token_type get_stop_token()                                               = 0;
-        virtual C&              get_context()                                                  = 0;
+        virtual void            complete(typename lazy_promise_base<std::remove_cvref_t<T>>::result_t&) = 0;
+        virtual stop_token_type get_stop_token()                                                        = 0;
+        virtual C&              get_context()                                                           = 0;
 
       protected:
         virtual ~state_base() = default;
@@ -251,7 +251,7 @@ struct lazy {
             handle.promise().state = this;
             handle.resume();
         }
-        void complete(lazy_promise_base<std::remove_cvref_t<T>>::result_t& result) override {
+        void complete(typename lazy_promise_base<std::remove_cvref_t<T>>::result_t& result) override {
             switch (result.index()) {
             case 0: // set_stopped
                 this->reset_handle();

diff --git a/include/beman/lazy/detail/poly.hpp b/include/beman/lazy/detail/poly.hpp
@@ -12,23 +12,62 @@
 // ----------------------------------------------------------------------------
 
 namespace beman::lazy::detail {
-template <typename Base, std::size_t Size>
+/*!
+ * \brief Utility providing small object optimization and type erasure.
+ * \headerfile beman/lazy/lazy.hpp <beman/lazy/lazy.hpp>
+ * \internal
+ */
+template <typename Base, std::size_t Size = 4u * sizeof(void*)>
 class alignas(sizeof(double)) poly {
   private:
     std::array<std::byte, Size> buf{};
-    Base*                       pointer() { return static_cast<Base*>(static_cast<void*>(buf.data())); }
+
+    Base*       pointer() { return static_cast<Base*>(static_cast<void*>(buf.data())); }
     const Base* pointer() const { return static_cast<const Base*>(static_cast<const void*>(buf.data())); }
 
   public:
     template <typename T, typename... Args>
+        requires(sizeof(T) <= Size)
     poly(T*, Args&&... args) {
         new (this->buf.data()) T(::std::forward<Args>(args)...);
         static_assert(sizeof(T) <= Size);
     }
-    poly(poly&& other) { other.pointer()->move(this->buf.data()); }
-    poly(const poly& other) { other.pointer()->clone(this->buf.data()); }
+    poly(poly&& other)
+        requires requires(Base* b, void* t) { b->move(t); }
+    {
+        other.pointer()->move(this->buf.data());
+    }
+    poly& operator=(poly&& other)
+        requires requires(Base* b, void* t) { b->move(t); }
+    {
+        if (this != &other) {
+            this->pointer()->~Base();
+            other.pointer()->move(this->buf.data());
+        }
+        return *this;
+    }
+    poly& operator=(const poly& other)
+        requires requires(Base* b, void* t) { b->clone(t); }
+    {
+        if (this != &other) {
+            this->pointer()->~Base();
+            other.pointer()->clone(this->buf.data());
+        }
+        return *this;
+    }
+    poly(const poly& other)
+        requires requires(Base* b, void* t) { b->clone(t); }
+    {
+        other.pointer()->clone(this->buf.data());
+    }
     ~poly() { this->pointer()->~Base(); }
-    bool  operator==(const poly& other) const { return other.pointer()->equals(this->pointer()); }
+    bool operator==(const poly& other) const
+        requires requires(const Base& b) {
+            { b.equals(&b) } -> std::same_as<bool>;
+        }
+    {
+        return other.pointer()->equals(this->pointer());
+    }
     Base* operator->() { return this->pointer(); }
 };
 } // namespace beman::lazy::detail

diff --git a/tests/beman/lazy/CMakeLists.txt b/tests/beman/lazy/CMakeLists.txt
@@ -1,9 +1,13 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-add_executable(beman.lazy.tests.lazy)
-target_sources(beman.lazy.tests.lazy PRIVATE lazy.test.cpp)
-target_link_libraries(beman.lazy.tests.lazy PRIVATE beman::lazy)
-add_test(
-    NAME beman.lazy.tests.lazy
-    COMMAND $<TARGET_FILE:beman.lazy.tests.lazy>
-)
+list(APPEND lazy_tests poly lazy)
+
+foreach(test ${lazy_tests})
+    add_executable(beman.lazy.tests.${test})
+    target_sources(beman.lazy.tests.${test} PRIVATE ${test}.test.cpp)
+    target_link_libraries(beman.lazy.tests.${test} PRIVATE beman::lazy)
+    add_test(
+        NAME beman.lazy.tests.${test}
+        COMMAND $<TARGET_FILE:beman.lazy.tests.${test}>
+    )
+endforeach()
diff --git a/tests/beman/lazy/lazy.test.cpp b/tests/beman/lazy/lazy.test.cpp
@@ -2,7 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <beman/lazy/lazy.hpp>
+#include <beman/execution26/execution.hpp>
+#include <cassert>
+
+namespace ex = beman::execution26;
 
 // ----------------------------------------------------------------------------
 
-int main() {}
+int main() {
+    auto rc = ex::sync_wait([]() -> ex::lazy<int> { co_return 17; }());
+    assert(rc);
+    auto [value] = rc.value_or(std::tuple{0});
+    assert(value == 17);
+}