Changeset 971d9f2 for src/tests/coroutine

Timestamp:

Dec 6, 2017, 8:01:23 AM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

16988e8

Parents:

65197c2

Message:

add "with" clause to test programs

Location:

src/tests/coroutine

Files:

• .expect/fibonacci.txt (moved) (moved from src/tests/coroutine/.expect/coroutine.txt )
• fibonacci.c (moved) (moved from src/tests/coroutine/coroutine.c ) (2 diffs)
• fmtLines.c (modified) (2 diffs)
• prodcons.c (modified) (3 diffs)

src/tests/coroutine/fibonacci.c

@@ -10 +10 @@
 // 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 : Tue Dec  5 22:27:54 2017
+// Update Count     : 14
 //
 
@@ -17 +17 @@
 #include <coroutine>
 
-coroutine Fibonacci {
-        int fn;                                                                                         // used for communication
-};
+coroutine Fibonacci { int fn; };                                                // used for communication
 
-void ?{}( Fibonacci & this ) {
-        this.fn = 0;
-}
+void ?{}( Fibonacci & fib ) with( fib ) { fn = 0; }
 
-void main( Fibonacci & this ) {
+void main( Fibonacci & fib ) with( fib ) {
         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;
 }
 

src/tests/coroutine/fmtLines.c

@@ -10 +10 @@
 // Created On       : Sun Sep 17 21:56:15 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Oct  1 11:57:19 2017
-// Update Count     : 34
+// Last Modified On : Tue Dec  5 21:56:35 2017
+// Update Count     : 38
 // 
 
@@ -26 +26 @@
 }
 
-void ^?{}( Format & fmt ) {
-        if ( fmt.g != 0 || fmt.b != 0 ) sout | endl;
+void ^?{}( Format & fmt ) with( fmt ) {
+        if ( g != 0 || b != 0 ) sout | endl;
 }
 
-void main( Format & fmt ) {
+void main( Format & fmt ) with( fmt ) {
         for ( ;; ) {                                                                            // for as many characters
-                for ( fmt.g = 0; fmt.g < 5; fmt.g += 1 ) {              // groups of 5 blocks
-                        for ( fmt.b = 0; fmt.b < 4; fmt.b += 1 ) {      // blocks of 4 characters
+                for ( g = 0; g < 5; g += 1 ) {                                  // groups of 5 blocks
+                        for ( b = 0; b < 4; b += 1 ) {                          // blocks of 4 characters
                                 for ( ;; ) {                                                    // for newline characters
                                         suspend();
-                                        if ( fmt.ch != '\n' ) break;            // ignore newline
+                                        if ( ch != '\n' ) break;                        // ignore newline
                                 } // for
-                                sout | fmt.ch;                                                  // print character
+                                sout | ch;                                                              // print character
                         } // for
                         sout | "  ";                                                            // print block separator

src/tests/coroutine/prodcons.c

@@ -10 +10 @@
 // Created On       : Mon Sep 18 12:23:39 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Oct 30 23:06:05 2017
-// Update Count     : 42
+// Last Modified On : Tue Dec  5 22:40:55 2017
+// Update Count     : 46
 // 
 
@@ -24 +24 @@
 
 coroutine Prod {
-        Cons *c;
+        Cons * c;
         int N, money, receipt;
 };
-void main( Prod & prod ) {                                                              // starter ::main
+void main( Prod & prod ) with( prod ) {                                 // starter ::main
         // 1st resume starts here
-        for ( int i = 0; i < prod.N; i += 1 ) {
+        for ( int i = 0; i < N; i += 1 ) {
                 int p1 = random( 100 );
                 int p2 = random( 100 );
                 sout | p1 | " " | p2 | endl;
-                int status = delivery( *prod.c, p1, p2 );
-                sout | " $" | prod.money | endl;
+                int status = delivery( *c, p1, p2 );
+                sout | " $" | money | endl;
                 sout | status | endl;
-                prod.receipt += 1;
+                receipt += 1;
         }
-        stop( *prod.c );
+        stop( *c );
         sout | "prod stops" | endl;
 }
@@ -64 +64 @@
 }
 void ^?{}( Cons & cons ) {}
-void main( Cons & cons ) {                                                              // starter prod
+void main( Cons & cons ) with( cons ) {                                 // starter prod
         // 1st resume starts here
         int money = 1, receipt;
-        for ( ; ! cons.done; ) {
-                sout | cons.p1 | " " | cons.p2 | endl;
+        for ( ; ! done; ) {
+                sout | p1 | " " | p2 | endl;
                 sout | " $" | money | endl;
-                cons.status += 1;
-                receipt = payment( *cons.p, money );
+                status += 1;
+                receipt = payment( *p, money );
                 sout | " #" | receipt | endl;
                 money += 1;