Changeset e99e43f for tests/coroutine/prodcons.cfa

Timestamp:

Jan 10, 2019, 3:50:34 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

d97c3a4

Parents:

aeb8f70 (diff), 08222c7 (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.

git-author:

Aaron Moss <a3moss@…> (01/10/19 14:46:09)

git-committer:

Aaron Moss <a3moss@…> (01/10/19 15:50:34)

Message:

Merge remote-tracking branch 'plg/master' into deferred_resn

File:

• tests/coroutine/prodcons.cfa (moved) (moved from tests/coroutine/prodcons.c ) (6 diffs)

tests/coroutine/prodcons.cfa

@@ -10 +10 @@
 // Created On       : Mon Sep 18 12:23:39 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug 18 12:55:10 2018
-// Update Count     : 51
+// Last Modified On : Wed Dec 12 23:04:49 2018
+// Update Count     : 53
 //
 
@@ -24 +24 @@
 
 coroutine Prod {
-        Cons * c;
+        Cons & c;
         int N, money, receipt;
 };
@@ -30 +30 @@
         // 1st resume starts here
         for ( i; N ) {                                                                          // N pairs of values
-                int p1 = random( 100 );
-                int p2 = random( 100 );
-                sout | p1 | " " | p2 | endl;
-                int status = delivery( *c, p1, p2 );
-                sout | " $" | money | endl;
-                sout | status | endl;
+                int p1 = random( 100 ), p2 = random( 100 );
+                sout | p1 | " " | p2;
+                int status = delivery( c, p1, p2 );
+                sout | " $" | money | nl | status;
                 receipt += 1;
         }
-        stop( *c );
-        sout | "prod stops" | endl;
+        stop( c );
+        sout | "prod stops";
 }
 int payment( Prod & prod, int money ) {
@@ -47 +45 @@
 }
 void start( Prod & prod, int N, Cons &c ) {
-        prod.N = N;
-        prod.c = &c;
-        prod.receipt = 0;
+        &prod.c = &c;
+        prod.[N, receipt] = [N, 0];
         resume( prod );                                                                         // activate main
 }
 
 coroutine Cons {
-        Prod * p;
+        Prod & p;
         int p1, p2, status;
         bool done;
 };
 void ?{}( Cons & cons, Prod & p ) {
-        cons.p = &p;
-        cons.status = 0;
-        cons.done = false;
+        &cons.p = &p;
+        cons.[status, done ] = [0, false];
 }
 void ^?{}( Cons & cons ) {}
@@ -68 +64 @@
         int money = 1, receipt;
         for ( ; ! done; ) {
-                sout | p1 | " " | p2 | endl;
-                sout | " $" | money | endl;
+                sout | p1 | " " | p2 | nl | " $" | money;
                 status += 1;
-                receipt = payment( *p, money );
-                sout | " #" | receipt | endl;
+                receipt = payment( p, money );
+                sout | " #" | receipt;
                 money += 1;
         }
-        sout | "cons stops" | endl;
+        sout | "cons stops";
 }
 int delivery( Cons & cons, int p1, int p2 ) {
-        cons.p1 = p1;
-        cons.p2 = p2;
+        cons.[p1, p2] = [p1, p2];
         resume( cons );                                                                         // main 1st time, then
         return cons.status;                                                                     // cons in payment
@@ -92 +86 @@
         srandom( /* getpid() */ 103 );                                          // fixed seed for testing
         start( prod, 5, cons );
-        sout | "main stops" | endl;
+        sout | "main stops";
 }