Changeset 90152a4 for tests/coroutine/fibonacci.c

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

File:

• tests/coroutine/fibonacci.c (moved) (moved from src/tests/coroutine/coroutine.c ) (1 diff)

tests/coroutine/fibonacci.c

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// fibonacci.c --
+// fibonacci.c -- 3-state finite-state machine
 //
 // Author           : Thierry Delisle
 // Created On       : Thu Jun  8 07:29:37 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep 17 21:38:15 2017
-// Update Count     : 7
+// Last Modified On : Sat Aug 18 11:21:58 2018
+// Update Count     : 24
 //
 
-#include <fstream>
-#include <coroutine>
+#include <fstream.hfa>
+#include <coroutine.hfa>
 
-coroutine Fibonacci {
-        int fn;                                                                                         // used for communication
-};
+coroutine Fibonacci { int fn; };                                                // used for communication
 
-void ?{}( Fibonacci & this ) {
-        this.fn = 0;
-}
-
-void main( Fibonacci & this ) {
+void main( Fibonacci & fib ) with( fib ) {                              // called on first resume
         int fn1, fn2;                                                                           // retained between resumes
-        this.fn = 0;                                                                            // case 0
-        fn1 = this.fn;
+        fn = 0;  fn1 = fn;                                                                      // 1st case
         suspend();                                                                                      // restart last resume
-
-        this.fn = 1;                                                                            // case 1
-        fn2 = fn1;  fn1 = this.fn;
+        fn = 1;  fn2 = fn1;  fn1 = fn;                                          // 2nd case
         suspend();                                                                                      // restart last resume
-
-        for ( ;; ) {                                                                            // general case
-                this.fn = fn1 + fn2;
-                fn2 = fn1;  fn1 = this.fn;
+        for () {
+                fn = fn1 + fn2;  fn2 = fn1;  fn1 = fn;                  // general case
                 suspend();                                                                              // restart last resume
         } // for
 }
 
-int next( Fibonacci & this ) {
-        resume( this );                                                                         // restart last suspend
-        return this.fn;
+int next( Fibonacci & fib ) with( fib ) {
+        resume( fib );                                                                          // restart last suspend
+        return fn;
 }
 
 int main() {
         Fibonacci f1, f2;
-        for ( int i = 1; i <= 10; i += 1 ) {
+        for ( 10 ) {                                                                            // print N Fibonacci values
                 sout | next( f1 ) | next( f2 ) | endl;
         } // for