Changeset 8f936bf

Timestamp:

Mar 19, 2019, 4:30:33 PM (5 years ago)

Author:

tdelisle <tdelisle@…>

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:

be3416d

Message:

Got rid of weird yield in fmt example

Location:

doc/papers/concurrency/c++-cor

Files:

• C++Cor-ts.cpp (modified) (2 diffs)
• fmt.cpp (modified) (4 diffs)

doc/papers/concurrency/c++-cor/C++Cor-ts.cpp

@@ -18 +18 @@
 //==================================================
 
-
 co_yield i;
 
@@ -28 +27 @@
 
 co_await __promise.yield_value(i);
+
+//==================================================
+
+... coroutine() {
+        __coroutine_context* __context = new __coroutine_context{};
+        __return = __context->_promise.get_return_object();
+        co_await   __context->_promise.initial_suspend();
+
+        ...
+
+__final_suspend_label:
+        co_await __context->promise.final_suspend();
+        delete __context;
+}

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

@@ -4 +4 @@
 struct fmt_cor {
         struct promise_type {
-                char * _value = nullptr;
+                char _value;
+                int g, b;
 
                 fmt_cor get_return_object() {
@@ -11 +12 @@
 
                 auto initial_suspend() { return suspend_never(); }
-                auto final_suspend()   {
-                        return suspend_always();
+                auto final_suspend()   { return suspend_always(); }
+
+                void return_void() {}
+                void unhandled_exception() {}
+        };
+
+        struct get {
+                promise_type * _promise = nullptr;
+
+                bool await_ready() noexcept {
+                        return false;
                 }
 
-                void return_void() {}
-
-                auto yield_value(char & value) {
-                        _value = &value;
-                        return suspend_always();
+                void await_suspend(std::experimental::coroutine_handle<promise_type> _coroutine) noexcept {
+                        _promise = &_coroutine.promise();
                 }
-
-                void unhandled_exception() {}
+                char await_resume() noexcept {
+                        assert(_promise);
+                        return _promise->_value;
+                }
         };
 
@@ -52 +61 @@
 
         void send(char a) {
-                assert(_coroutine.promise()._value);
-                *_coroutine.promise()._value = a;
+                _coroutine.promise()._value = a;
                 _coroutine.resume();
         }
@@ -59 +67 @@
 
 fmt_cor Fmt() {
-        char c;
-        int g, b;
+        int g; // = co_await fmt_cor::g();
+        int b; // = co_await fmt_cor::b();
         for(;;) {
                 for(g = 0; g < 5; g++) {
                         for(b = 0; b < 4; b++) {
-                                co_yield c;
-                                std::cout << c;
+                                std::cout << co_await fmt_cor::get();
                         }
                         std::cout << "  ";