Update status

README.md

@@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 -->
 
 <!-- markdownlint-disable line-length -->
-[![Library Status](https://raw.githubusercontent.com/bemanproject/beman/refs/heads/main/images/badges/beman_badge-beman_library_under_development.svg)](https://github.com/bemanproject/beman/blob/main/docs/beman_library_maturity_model.md#the-beman-library-maturity-model)![Standard Target](https://github.com/bemanproject/beman/blob/main/images/badges/cpp26.svg)[![Coverage](https://coveralls.io/repos/github/bemanproject/execution/badge.svg?branch=main)](https://coveralls.io/github/bemanproject/execution?branch=main)[![Compiler Explorer Example](https://img.shields.io/badge/Try%20it%20on%20Compiler%20Explorer-grey?logo=compilerexplorer&logoColor=67c52a)](https://godbolt.org/z/9nfa3rTTK)
+[![Library Status](https://raw.githubusercontent.com/bemanproject/beman/refs/heads/main/images/badges/beman_badge-beman_library_under_development.svg)](https://github.com/bemanproject/beman/blob/main/docs/beman_library_maturity_model.md#the-beman-library-maturity-model)![Standard Target](https://github.com/bemanproject/beman/blob/main/images/badges/cpp26.svg)[![Coverage](https://coveralls.io/repos/github/bemanproject/execution/badge.svg?branch=main)](https://coveralls.io/github/bemanproject/execution?branch=main)[![Compiler Explorer Example](https://img.shields.io/badge/Try%20it%20on%20Compiler%20Explorer-grey?logo=compilerexplorer&logoColor=67c52a)](https://godbolt.org/z/jeMEWGYbM)
 <!-- markdownlint-restore -->
 
 

examples/CMakeLists.txt

@@ -17,7 +17,6 @@ if(PROJECT_IS_TOP_LEVEL)
     enable_testing()
 endif()
 
-set(TODO stop_token) #-dk:TODO including that causes a linker error
 set(TODO suspend_never) #-dk:TODO including that causes ASAN errors
 
 set(EXAMPLES
@@ -33,6 +32,7 @@ set(EXAMPLES
     sender_demo
     stackoverflow
     stopping
+    stop_token
     when_all_cancel
 )
 

examples/allocator.cpp

@@ -1,12 +1,17 @@
 // examples/allocator.cpp                                             -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
 #include <iostream>
 #include <string>
 #include <memory>
 #include <memory_resource>
 #include <span>
 #include <vector>
+#endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else

examples/doc_just.cpp

@@ -2,7 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <cassert>
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
 #include <string>
+#endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else

examples/doc_just_error.cpp

@@ -1,8 +1,13 @@
 // examples/doc_just_error.cpp                                        -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <system_error>
 #include <cassert>
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
+#include <system_error>
+#endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else

examples/doc_just_stopped.cpp

@@ -1,8 +1,13 @@
 // examples/doc_just_stopped.cpp                                      -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <system_error>
 #include <cassert>
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
+#include <system_error>
+#endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else

examples/inspect.cpp

@@ -1,13 +1,18 @@
 // examples/inspectc.pp                                               -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
 #include <iostream>
 #include <ostream>
 #include <sstream>
 #include <string>
 #include <typeinfo>
 #include <tuple>
 #include <variant>
+#endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else

examples/intro_1_hello_world.cpp

@@ -1,11 +1,16 @@
 // examples/intro_1_hello_world.cpp                                   -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
 #include <iostream>
 #include <optional>
 #include <string>
 #include <tuple>
 #include <variant>
+#endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
@@ -20,15 +25,17 @@ using namespace std::string_literals;
 
 int main() {
     // clang-format off
+#if !defined(__GNUC__) || defined(__clang__) || (__GNUC__ > 15) || !defined(BEMAN_HAS_MODULES)
     auto [result] =
     ex::sync_wait(
         ex::when_all(
             ex::just("hello, "s),
             ex::just("world"s)
         ) | ex::then([](auto const& s1, auto const& s2) { return s1 + s2; })
-        ) .value_or(std::tuple(""s))
+        ).value_or(std::tuple(""s))
         ;
+#endif
     // clang-format on
 
-    std::cout << result << '\n';
+    // std::cout << std::get<0>(v) << '\n';
 }

examples/intro_2_hello_async.cpp

@@ -1,12 +1,17 @@
 // examples/intro_2_hello_async.cpp                                   -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
 #include <chrono>
 #include <iostream>
 #include <queue>
 #include <string>
 #include <thread>
 #include <tuple>
+#endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
@@ -23,6 +28,7 @@ using namespace std::chrono_literals;
 
 int main() {
     std::cout << std::unitbuf;
+#if !defined(__GNUC__) || defined(__clang__) || (__GNUC__ > 15) || !defined(BEMAN_HAS_MODULES)
     intro::timer timer;
 
     // clang-format off
@@ -42,4 +48,5 @@ int main() {
     // clang-format on
 
     std::cout << result << "\n";
+#endif
 }

examples/intro_5_consumer.cpp

@@ -1,6 +1,10 @@
 // examples/intro_5_consumer.cpp                                      -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
 #include <beman/execution/detail/suppress_push.hpp>
 #include <chrono>
 //-dk:TODO restore if that actually works #include <expected>
@@ -9,6 +13,7 @@
 #include <tuple>
 #include <variant>
 #include <cinttypes>
+#endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 import beman.execution.detail;

examples/modules_and_header.cpp

@@ -1,7 +1,12 @@
 // examples/modules_and_header.cpp                                    -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
 #include <tuple>
+#endif
 import beman.execution;
 namespace ex = beman::execution;
 

examples/playground.cpp

@@ -1,10 +1,15 @@
 // examples/playground.cpp                                            -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
 #include <iostream>
 #include <string>
 #include <tuple>
 #include <variant>
+#endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
@@ -16,8 +21,10 @@ namespace ex = ::beman::execution;
 // ----------------------------------------------------------------------------
 
 int main() {
+#if !defined(__GNUC__) || defined(__clang__) || (__GNUC__ > 15) || !defined(BEMAN_HAS_MODULES)
     auto [result] = ex::sync_wait(ex::when_all(ex::just(std::string("hello, ")), ex::just(std::string("world"))) |
                                   ex::then([](const auto& s1, const auto& s2) { return s1 + s2; }))
                         .value_or(std::tuple(std::string("oops")));
     std::cout << "result='" << result << "'\n";
+#endif
 }

examples/sender_demo.cpp

@@ -1,12 +1,17 @@
 // examples/sender_demo.cpp                                           -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
 #include <iostream>
 #include <memory_resource>
 #include <string>
 #include <type_traits>
 #include <utility>
 #include <variant>
+#endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 import beman.execution.detail;
@@ -60,19 +65,21 @@ static_assert(ex::sender_in<just_sender<std::pmr::string>>);
 
 int main() {
     try {
-        auto j = just_sender<std::pmr::string>{std::pmr::string("value")};
-        auto t = std::move(j) | ex::then([](const std::pmr::string& v) { return v + " then"; });
-        auto w = ex::when_all(std::move(t));
-        auto e =
+        auto                  j = just_sender<std::pmr::string>{std::pmr::string("value")};
+        auto                  t = std::move(j) | ex::then([](const std::pmr::string& v) { return v + " then"; });
+        auto                  w = ex::when_all(std::move(t));
+        [[maybe_unused]] auto e =
             ex::write_env(std::move(w), ex::detail::make_env(ex::get_allocator, std::pmr::polymorphic_allocator<>()));
 
         std::cout << "before start\n";
+#if !defined(__GNUC__) || defined(__clang__) || (__GNUC__ > 15) || !defined(BEMAN_HAS_MODULES)
         auto r = ex::sync_wait(std::move(e));
         if (r) {
             auto [v] = *r;
             std::cout << "produced='" << v << "'\n";
         } else
             std::cout << "operation was cancelled\n";
+#endif
         std::cout << "after start\n";
     } catch (const std::exception& ex) {
         std::cout << "ERROR: " << ex.what() << "\n";

examples/stackoverflow.cpp

@@ -1,11 +1,16 @@
 // examples/stackoverflow.cpp                                         -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
 #include <coroutine>
 #include <iostream>
 #include <memory>
 #include <type_traits>
 #include <utility>
+#endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else

examples/stop_token.cpp

@@ -1,12 +1,17 @@
 // examples/stop_token.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
 #include <condition_variable>
 #include <iostream>
 #include <exception>
 #include <latch>
 #include <mutex>
 #include <thread>
+#endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
@@ -87,9 +92,12 @@ auto inactive(const Token& token) -> void {
 template <typename Token>
 auto inactive(Token token) -> void {
     ::std::condition_variable cond;
-    stop_callback_for_t       cb(token, [&cond] { cond.notify_one(); });
+    ::std::mutex              lock;
+    stop_callback_for_t       cb(token, [&cond, &lock] {
+        ::std::lock_guard guard(lock);
+        cond.notify_one();
+    });
 
-    ::std::mutex       lock;
     ::std::unique_lock guard(lock);
     cond.wait(guard, [token] { return token.stop_requested(); });
     print("inactive thread done (condition_variable)\n");

examples/stopping.cpp

@@ -6,11 +6,16 @@
 // which gets started in a thread. To stop this thread
 // the corresponding stop source is requested to stop.
 
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
 #include <chrono>
 #include <iostream>
 #include <mutex>
 #include <thread>
 #include <cassert>
+#endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
@@ -19,6 +24,7 @@ import beman.execution;
 #endif
 
 using namespace std::chrono;
+using namespace std::chrono_literals;
 namespace ex = beman::execution;
 
 // ----------------------------------------------------------------------------

examples/when_all_cancel.cpp

@@ -1,15 +1,19 @@
 // examples/when_all_cancel.cpp                                       -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#include <cassert>
+#include <beman/execution/detail/common.hpp>
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#else
 #include <exception>
 #include <iostream>
 #include <optional>
 #include <string>
 #include <tuple>
 #include <type_traits>
 #include <utility>
-#include <variant>
-#include <cassert>
+#endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
@@ -146,6 +150,7 @@ eager(Sender&&) -> eager<std::remove_cvref_t<Sender>>;
 } // namespace
 
 auto main() -> int {
+#if !defined(__GNUC__) || defined(__clang__) || (__GNUC__ > 15) || !defined(BEMAN_HAS_MODULES)
     auto s{eager{ex::when_all(await_stop{})}};
 
     ex::inplace_stop_source source{};
@@ -155,4 +160,5 @@ auto main() -> int {
     std::cout << "started\n";
     source.request_stop();
     std::cout << "done\n";
+#endif
 }

include/beman/execution/detail/as_except_ptr.hpp

@@ -25,6 +25,7 @@ namespace beman::execution::detail {
  * \internal
  */
 template <typename Error>
+//-dk:TODO add a proper precondition
 decltype(auto) as_except_ptr(Error&& error) {
     if constexpr (::std::same_as<::std::exception_ptr, ::std::decay_t<Error>>) {
         return ::std::forward<Error>(error);