Changeset 77bc259

Timestamp:

Feb 12, 2024, 1:07:26 PM (14 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

c185ca9

Parents:

6b228cae

Message:

move exception macro to general location, update more code to use macros

Files:

• libcfa/src/Exception.hfa (modified) (1 diff)
• libcfa/src/fstream.cfa (modified) (5 diffs)
• libcfa/src/fstream.hfa (modified) (6 diffs)
• tests/exceptions/pingpong_nonlocal.cfa (modified) (5 diffs)

libcfa/src/Exception.hfa ¶

@@ -2 +2 @@
 
 // TEMPORARY
-#define ExceptionDecl( name, fields... ) exception name{ fields }; __attribute__(( cfa_linkonce )) vtable( name ) name ## _vt
-#define ExceptionInst( name, values... ) (name){ &name ## _vt, values }
+#define ExceptionDecl( name, fields... ) exception name{ fields }; \
+        __attribute__(( cfa_linkonce )) vtable( name ) name ## _vt
+#define ExceptionArgs( name, args... ) &name ## _vt, args
+#define ExceptionInst( name, args... ) (name){ ExceptionArgs( name, args ) }

libcfa/src/fstream.cfa ¶

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  1 18:32:15 2024
-// Update Count     : 575
+// Last Modified On : Sun Feb 11 20:55:45 2024
+// Update Count     : 580
 //
 
@@ -321 +321 @@
 
 
-static vtable(open_failure) open_failure_vt;
-
 // exception I/O constructors
 void ?{}( open_failure & ex, ofstream & ostream ) with( ex ) {
@@ -337 +335 @@
 
 
-static vtable(close_failure) close_failure_vt;
-
 // exception I/O constructors
 void ?{}( close_failure & ex, ofstream & ostream ) with( ex ) {
@@ -353 +349 @@
 
 
-static vtable(write_failure) write_failure_vt;
-
 // exception I/O constructors
 void ?{}( write_failure & ex, ofstream & ostream ) with( ex ) {
@@ -369 +363 @@
 
 
-static vtable(read_failure) read_failure_vt;
-
 // exception I/O constructors
 void ?{}( read_failure & ex, ofstream & ostream ) with( ex ) {

libcfa/src/fstream.hfa ¶

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Oct 18 20:30:12 2023
-// Update Count     : 261
+// Last Modified On : Sun Feb 11 20:35:00 2024
+// Update Count     : 274
 //
 
@@ -139 +139 @@
 
 
-exception open_failure {
+ExceptionDecl( open_failure,
         union {
                 ofstream * ostream;
@@ -146 +146 @@
         // TEMPORARY: need polymorphic exceptions
         int tag;                                                                                        // 1 => ostream; 0 => istream
-};
+);
 
 void ?{}( open_failure & this, ofstream & );
 void ?{}( open_failure & this, ifstream & );
 
-exception close_failure {
+ExceptionDecl( close_failure,
         union {
                 ofstream * ostream;
@@ -158 +158 @@
         // TEMPORARY: need polymorphic exceptions
         int tag;                                                                                        // 1 => ostream; 0 => istream
-};
+);
 
 void ?{}( close_failure & this, ofstream & );
 void ?{}( close_failure & this, ifstream & );
 
-exception write_failure {
+ExceptionDecl( write_failure,
         union {
                 ofstream * ostream;
@@ -170 +170 @@
         // TEMPORARY: need polymorphic exceptions
         int tag;                                                                                        // 1 => ostream; 0 => istream
-};
+);
 
 void ?{}( write_failure & this, ofstream & );
 void ?{}( write_failure & this, ifstream & );
 
-exception read_failure {
+ExceptionDecl( read_failure,
         union {
                 ofstream * ostream;
@@ -182 +182 @@
         // TEMPORARY: need polymorphic exceptions
         int tag;                                                                                        // 1 => ostream; 0 => istream
-};
+);
 
 void ?{}( read_failure & this, ofstream & );

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";