Changeset c3f7dd9 for tests

Timestamp:

Jul 10, 2023, 3:45:12 PM (19 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

04c31f4

Parents:

555c599 (diff), 713905fd (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests/exceptions

Files:

• .expect/fibonacci_nonlocal.txt (modified) (1 diff)
• .expect/pingpong_nonlocal.txt (moved) (moved from tests/exceptions/.expect/nonlocal_pingpong.txt)
• fibonacci_nonlocal.cfa (modified) (2 diffs)
• pingpong_nonlocal.cfa (moved) (moved from tests/exceptions/nonlocal_pingpong.cfa)

tests/exceptions/.expect/fibonacci_nonlocal.txt

@@ -1 @@
-0
-1
-1
-0
-2
-4
-20
+    0     0
+    1     1
+    1     1
+    2     2
+    3     3
+    5     5
+    8     8
+   13    13

tests/exceptions/fibonacci_nonlocal.cfa

@@ -9 +9 @@
 // Author           : Colby Parsons
 // Created On       : Thu July  6 07:29:37 2023
-// Last Modified By : Colby Parsons
-// Last Modified On : Thu July  6 07:29:37 2023
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul  6 21:49:04 2023
+// Update Count     : 18
 //
 
@@ -18 +18 @@
 #include <stdlib.hfa>
 
-exception fib_num {
-    int num;
-};
+exception fib_num {};
 vtable(fib_num) fib_num_vt;
-
-exception fib_2_num {
-    int num1, num2;
-};
-vtable(fib_2_num) fib_2_num_vt;
+fib_num except{ &fib_num_vt };
 
 coroutine Fibonacci { int fn; };                                                // used for communication
 
 void main( Fibonacci & fib ) with( fib ) {                              // called on first resume
-    int fn1, fn2;                                                                               // retained between resumes
-    try{
-        fn = 0;  fn1 = fn;                                                                      // 1st case
-        poll( fib );
-        suspend;                                                                                        // restart last resume
-        fn = 1;  fn2 = fn1;  fn1 = fn;                                          // 2nd case
-        poll( fib );
-        suspend;                                                                                        // restart last resume
-        for () {
-            fn = fn1 + fn2;  fn2 = fn1;  fn1 = fn;                      // general case
-            poll( fib );
-            suspend;                                                                            // restart last resume
-        } // for
-    } catchResume ( fib_num * e ) {
-        fn1 = e->num;
-        fn2 = e->num;
-        fn = fn1 + fn2;
-    }  catchResume ( fib_2_num * e ) {
-        fn1 = e->num1;
-        fn2 = e->num1;
-        fn = fn1 + fn2;
-    }
+        int fn1, fn2;                                                                           // retained between resumes
+        try {
+                poll( fib );
+                suspend;                                                                                // restart last resume
+        } catchResume ( fib_num * e ) {
+                fn = 0;  fn1 = fn;                                                              // 1st case
+        }
+        try {
+                poll( fib );
+                suspend;                                                                                // restart last resume
+        } catchResume ( fib_num * e ) {
+                fn = 1;  fn2 = fn1;  fn1 = fn;                                  // 2nd case
+        }
+        try {
+                for () {
+                        poll( fib );
+                        suspend;                                                                        // restart last resume
+                } // for
+        } catchResume ( fib_num * e ) {
+                fn = fn1 + fn2;  fn2 = fn1;  fn1 = fn;                  // general case
+        }
 }
 
 int main() {
         Fibonacci f1, f2;
-        for ( 3 ) {                                                                             // print N Fibonacci values
-                sout | resume( f1 ).fn;
-        } // for
-    for ( i; 3 ) {
-        fib_num except{ &fib_num_vt, i };
-        resumeAt( f1, except );
-        sout | resume( f1 ).fn;
-    }
-    {
-        fib_2_num except{ &fib_2_num_vt, 10, 12 };
-        resumeAt( f1, except );
-    }
-    sout | resume( f1 ).fn;
+        for ( i; 8 ) {
+                resumeAt( f1, except );  resumeAt( f2, except );
+                sout | wd( 5, resume( f1 ).fn ) | wd( 5, resume( f2 ).fn );
+        }
 }
 
 // Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa fibonacci.cfa" //
+// compile-command: "cfa fibonacci_nonlocal.cfa" //
 // End: //