Changeset 571bf75 for doc

Timestamp:

Mar 20, 2019, 3:42:24 PM (6 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:

709e0e0

Parents:

13b1b1d

Message:

Clean existing coroutines using std::experimental::suspend_never and fixed Format coroutines to use RAII

Location:

doc/papers/concurrency/examples

Files:

• Fib.cpp (modified) (3 diffs)
• Format.cpp (modified) (4 diffs)
• base.hpp (deleted)
• counter.cpp (modified) (3 diffs)

doc/papers/concurrency/examples/Fib.cpp

@@ -1 @@
-#include "base.hpp"
-
 #include <algorithm>
+#include <iostream>
 #include <iterator>
 #include <vector>
+
+#include <experimental/coroutine>
 
 template<typename T>
@@ -14 +15 @@
                 }
 
-                auto initial_suspend() { return suspend_always(); }
-                auto final_suspend()   { return suspend_always(); }
+                auto initial_suspend() { return std::experimental::suspend_always(); }
+                auto final_suspend()   { return std::experimental::suspend_always(); }
 
                 void return_value(T value) {
@@ -23 +24 @@
                 auto yield_value(T value) {
                         _value = value;
-                        return suspend_always();
+                        return std::experimental::suspend_always();
                 }
 

doc/papers/concurrency/examples/Format.cpp

@@ -1 @@
-
-#include "base.hpp"
+#include <iostream>
+#include <experimental/coroutine>
 
 struct fmt_cor {
         struct promise_type {
                 char _value;
-                struct locals {
-                        int g, b;
-                } * _l;
 
                 fmt_cor get_return_object() {
@@ -13 +10 @@
                 }
 
-                auto initial_suspend() { return suspend_never(); }
-                auto final_suspend()   { return suspend_always(); }
+                auto initial_suspend() { return std::experimental::suspend_never(); }
+                auto final_suspend()   { return std::experimental::suspend_always(); }
 
                 void return_void() {}
                 void unhandled_exception() {}
-
-                auto yield_value(locals & l) {
-                        _l = &l;
-                        return suspend_never();
-                }
         };
 
@@ -50 +42 @@
                 if(_coroutine) {
                         _coroutine.destroy();
-                        if (_coroutine.promise()._l->g != 0 | _coroutine.promise()._l->b != 0) {
-                                std::cout << "\n";
-                        }
+
                 }
         }
@@ -79 +69 @@
 
 fmt_cor Fmt() {
-        fmt_cor::promise_type::locals l;
-        co_yield l;
+        struct locals {
+                int g, b;
+
+                ~locals() {
+                        if (g != 0 | b != 0) {
+                                std::cout << "\n";
+                        }
+                }
+        } l;
         for(;;) {
                 for(l.g = 0; l.g < 5; l.g++) {

doc/papers/concurrency/examples/counter.cpp

@@ -1 @@
-#include "base.hpp"
+#include <iostream>
+#include <experimental/coroutine>
 
 struct counter_cor {
@@ -7 +8 @@
                 }
 
-                auto initial_suspend() { return suspend_never(); }
-                auto final_suspend()   { return suspend_never(); }
+                auto initial_suspend() { return std::experimental::suspend_never(); }
+                auto final_suspend()   { return std::experimental::suspend_never(); }
 
                 void return_void() {}
@@ -47 +48 @@
         std::cout << "Counter: called\n";
         for(unsigned i = 1;; i++) {
-                co_await suspend_always{};
+                co_await std::experimental::suspend_always{};
                 std::cout << "Counter: Resumed " << i << " time(s)\n";
         }