Changeset ff29f08 for src/tests/coroutine

Timestamp:

May 18, 2018, 2:09:21 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2472a19

Parents:

f6f0cca3 (diff), c7d8100c (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 remote-tracking branch 'origin/master' into with_gc

Location:

src/tests/coroutine

Files:

• fibonacci.c (modified) (3 diffs)
• fmtLines.c (modified) (3 diffs)

src/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 : Thu Mar 22 22:45:44 2018
-// Update Count     : 15
+// Last Modified On : Fri Apr 27 08:55:31 2018
+// Update Count     : 19
 //
 
@@ -19 +20 @@
 coroutine Fibonacci { int fn; };                                                // used for communication
 
-void ?{}( Fibonacci & fib ) with( fib ) { fn = 0; }
-
-// main automatically called on first resume
-void main( Fibonacci & fib ) with( fib ) {
+void main( Fibonacci & fib ) with( fib ) {                              // called on first resume
         int fn1, fn2;                                                                           // retained between resumes
         fn = 0;  fn1 = fn;                                                                      // 1st case
@@ -29 +27 @@
         suspend();                                                                                      // restart last resume
         for ( ;; ) {
-                fn = fn1 + fn2; fn2 = fn1;  fn1 = fn;                   // general case
+                fn = fn1 + fn2;  fn2 = fn1;  fn1 = fn;                  // general case
                 suspend();                                                                              // restart last resume
         } // for

src/tests/coroutine/fmtLines.c

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 // 
-// fmtLines.cc -- 
+// fmtLines.cc -- format characters into blocks of 4 and groups of 5 blocks per line
 // 
 // Author           : Peter A. Buhr
 // Created On       : Sun Sep 17 21:56:15 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec  5 21:56:35 2017
-// Update Count     : 38
+// Last Modified On : Tue May 15 12:25:33 2018
+// Update Count     : 42
 // 
 
@@ -21 +21 @@
         int g, b;                                                                                       // global because used in destructor
 };
-
-void ?{}( Format & fmt ) {
-        resume( fmt );                                                                          // prime (start) coroutine
-}
-
-void ^?{}( Format & fmt ) with( fmt ) {
-        if ( g != 0 || b != 0 ) sout | endl;
-}
 
 void main( Format & fmt ) with( fmt ) {
@@ -46 +38 @@
 } // main
 
-void prt( Format & fmt, char ch ) {
-        fmt.ch = ch;
+void ?{}( Format & fmt ) {
+        resume( fmt );                                                                          // prime (start) coroutine
+}
+
+void ^?{}( Format & fmt ) with( fmt ) {
+        if ( g != 0 || b != 0 ) sout | endl;
+}
+
+void format( Format & fmt ) {
         resume( fmt );
 } // prt
 
 int main() {
-        Format fmt;                                                                                     // format characters into blocks of 4 and groups of 5 blocks per line
-        char ch;
+        Format fmt;
 
-        Eof: for ( ;; ) {                                                                       // read until end of file
-                sin | ch;                                                                               // read one character
-          if ( eof( sin ) ) break Eof;                                          // eof ?
-                prt( fmt, ch );                                                                 // push character for formatting
+        eof: for ( ;; ) {                                                                       // read until end of file
+                sin | fmt.ch;                                                                   // read one character
+          if ( eof( sin ) ) break eof;                                          // eof ?
+                format( fmt );                                                                  // push character for formatting
         } // for
 } // main