Changeset 81a05ca for doc/papers/concurrency/c++-cor/fib.cpp

Timestamp:

Mar 19, 2019, 4:07:18 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

79b018f3

Parents:

7cfd6d4 (diff), be3416d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• doc/papers/concurrency/c++-cor/fib.cpp (modified) (4 diffs)

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

@@ -1 @@
-#include <iostream>
-#include <experimental/coroutine>
+#include "base.hpp"
 
-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 {}
-};
+#include <algorithm>
+#include <iterator>
+#include <vector>
 
 template<typename T>
@@ -29 +14 @@
                 }
 
-                auto initial_suspend() { return suspend_never(); }
-                auto final_suspend()   { return suspend_never(); }
+                auto initial_suspend() { return suspend_always(); }
+                auto final_suspend()   { return suspend_always(); }
 
                 void return_value(T value) {
@@ -74 +59 @@
                 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{}; }
 };
 
@@ -86 +100 @@
 
 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();
+                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;
+                }
         }
 }