Changes in / [81a05ca:7cfd6d4]

Location:

doc/papers/concurrency/c++-cor

Files:

• C++Cor-ts.cpp (deleted)
• base.hpp (deleted)
• counter.cpp (modified) (1 diff)
• fib.cpp (modified) (4 diffs)
• fmt.cpp (deleted)

doc/papers/concurrency/c++-cor/counter.cpp

@@ -1 @@
-#include "base.hpp"
+#include <iostream>
+#include <experimental/coroutine>
+
+struct suspend_never {
+        bool await_ready() noexcept {
+                return true;
+        }
+
+        void await_suspend(std::experimental::coroutine_handle<>) noexcept {}
+        void await_resume() noexcept {}
+};
+
+struct suspend_always {
+        bool await_ready() noexcept {
+                return false;
+        }
+
+        void await_suspend(std::experimental::coroutine_handle<>) noexcept {}
+        void await_resume() noexcept {}
+};
 
 struct counter_cor {

doc/papers/concurrency/c++-cor/fib.cpp

@@ -1 @@
-#include "base.hpp"
+#include <iostream>
+#include <experimental/coroutine>
 
-#include <algorithm>
-#include <iterator>
-#include <vector>
+struct suspend_never {
+        bool await_ready() noexcept {
+                return true;
+        }
+
+        void await_suspend(std::experimental::coroutine_handle<>) noexcept {}
+        void await_resume() noexcept {}
+};
+
+struct suspend_always {
+        bool await_ready() noexcept {
+                return false;
+        }
+
+        void await_suspend(std::experimental::coroutine_handle<>) noexcept {}
+        void await_resume() noexcept {}
+};
 
 template<typename T>
@@ -14 +29 @@
                 }
 
-                auto initial_suspend() { return suspend_always(); }
-                auto final_suspend()   { return suspend_always(); }
+                auto initial_suspend() { return suspend_never(); }
+                auto final_suspend()   { return suspend_never(); }
 
                 void return_value(T value) {
@@ -59 +74 @@
                 return _coroutine.promise()._value;
         }
-
-        struct iterator : std::iterator<std::input_iterator_tag, T> {
-                std::experimental::coroutine_handle<promise_type> _coroutine = nullptr;
-
-                iterator() = default;
-                explicit iterator(std::experimental::coroutine_handle<promise_type> coroutine)
-                        : _coroutine(coroutine)
-                {}
-
-                iterator& operator++() {
-                        _coroutine.resume();
-                        return *this;
-                }
-
-                T const & operator*() const {
-                        return _coroutine.promise()._value;
-                }
-        };
-
-        iterator begin() {
-                if(_coroutine) {
-                        _coroutine.resume();
-                        if(_coroutine.done()) { return end(); }
-                }
-
-                return iterator{ _coroutine };
-        }
-
-        iterator end() { return iterator{}; }
 };
 
@@ -100 +86 @@
 
 int main() {
-        {
-                auto f1 = fib();
-                auto f2 = fib();
-                for(int i = 0; i < 10; i++) {
-                        std::cout << f1.next() << " " << f2.next() << std::endl;
-                }
-        }
-
-        {
-                auto f1 = fib();
-                std::vector<int> fibs;
-                std::copy_n(f1.begin(), 10, std::back_inserter(fibs));
-
-                for(auto i : fibs) {
-                        std::cout << i << std::endl;
-                }
+        auto f1 = fib();
+        auto f2 = fib();
+        for(int i = 0; i < 10; i++) {
+                std::cout << f1.next() << " " << f2.next() << std::endl;
         }
 }