Changeset a4da45e for tests/exceptions

Timestamp:

Feb 26, 2024, 3:53:42 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

3f9a8d0

Parents:

0522ebe (diff), 022bce0 (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:

Resolve conflict

File:

• tests/exceptions/pingpong_nonlocal.cfa (modified) (5 diffs)

tests/exceptions/pingpong_nonlocal.cfa

@@ -2 +2 @@
 #include <thread.hfa>
 #include <mutex_stmt.hfa>
+#include <Exception.hfa>
 
-exception num_ping_pongs { int num; };
-vtable(num_ping_pongs) num_ping_pongs_vt;
+ExceptionDecl( num_ping_pongs, int num; );
 
 thread Ping_Pong {
@@ -16 +16 @@
         this.name = name;
         cnt = 0;
-        ?{}( except, &num_ping_pongs_vt, 0 );
+        ?{}( except, ExceptionArgs( num_ping_pongs, 0 ) );
 }
 
@@ -29 +29 @@
                 for () {
                         while( ! poll( this ) ) { yield(); }
-            inc_resume_at( cnt );
+                        inc_resume_at( cnt );
                 }
         } catchResume( num_ping_pongs * e; e->num < numtimes ) {
@@ -37 +37 @@
                 mutex( sout ) sout | name | "catch" | cnt | e->num;
                 if ( e->num == numtimes ) {
-            inc_resume_at( e->num );
+                        inc_resume_at( e->num );
                 }
         }
@@ -49 +49 @@
                 &ping.partner = &pong;                                                  // create cycle
                 &pong.partner = &ping;
-                num_ping_pongs except{ &num_ping_pongs_vt, 0 };
-                resumeAt( pong, except );
+                resumeAt( pong, ExceptionInst( num_ping_pongs, 0 ) );
         }
         sout | "main end";