Changeset 5a40e4e for tests

Timestamp:

Sep 9, 2021, 3:56:32 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

d0b9247

Parents:

dd1cc02 (diff), d8d512e (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

Files:

• .expect/declarationSpecifier.arm64.txt (modified) (2 diffs)
• .expect/declarationSpecifier.x64.txt (modified) (2 diffs)
• .expect/declarationSpecifier.x86.txt (modified) (2 diffs)
• .expect/gccExtensions.arm64.txt (modified) (2 diffs)
• .expect/gccExtensions.x64.txt (modified) (2 diffs)
• .expect/gccExtensions.x86.txt (modified) (2 diffs)
• .expect/parseconfig.txt (added)
• .in/parseconfig-all.txt (added)
• .in/parseconfig-errors.txt (added)
• .in/parseconfig-missing.txt (added)
• Makefile.am (modified) (1 diff)
• bitmanip3.cfa (modified) (3 diffs)
• collections/.expect/string-api-coverage.txt (added)
• collections/string-api-coverage.cfa (added)
• concurrent/mutexstmt/.expect/locks.txt (added)
• concurrent/mutexstmt/.expect/monitors.txt (added)
• concurrent/mutexstmt/locks.cfa (added)
• concurrent/mutexstmt/monitors.cfa (added)
• exceptions/.expect/type-check.txt (modified) (1 diff)
• exceptions/cancel/coroutine.cfa (modified) (1 diff)
• exceptions/cancel/thread.cfa (modified) (1 diff)
• exceptions/conditional.cfa (modified) (1 diff)
• exceptions/data-except.cfa (modified) (1 diff)
• exceptions/defaults.cfa (modified) (4 diffs)
• exceptions/finally.cfa (modified) (1 diff)
• exceptions/interact.cfa (modified) (1 diff)
• exceptions/polymorphic.cfa (modified) (2 diffs)
• exceptions/resume.cfa (modified) (1 diff)
• exceptions/terminate.cfa (modified) (1 diff)
• exceptions/trash.cfa (modified) (1 diff)
• exceptions/type-check.cfa (modified) (1 diff)
• mathX.cfa (modified) (2 diffs)
• parseconfig.cfa (added)
• unified_locking/.expect/lin_backoff.txt (added)

tests/.expect/declarationSpecifier.arm64.txt

@@ -1132 +1132 @@
 char **_X13cfa_args_argvPPc_1;
 char **_X13cfa_args_envpPPc_1;
+signed int _X17cfa_main_returnedi_1 = ((signed int )0);
 signed int main(signed int _X4argci_1, char **_X4argvPPc_1, char **_X4envpPPc_1){
     __attribute__ ((unused)) signed int _X12_retval_maini_1;
@@ -1146 +1147 @@
     }
 
-    {
-        signed int _tmp_cp_ret6;
-        ((void)(_X12_retval_maini_1=(((void)(_tmp_cp_ret6=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret6)) /* ?{} */);
+    signed int _tmp_cp_ret6;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret6=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret6);
+    {
+        ((void)(_X17cfa_main_returnedi_1=((signed int )1)));
+    }
+
+    {
+        ((void)(_X12_retval_maini_1=_X3reti_2) /* ?{} */);
     }
 

tests/.expect/declarationSpecifier.x64.txt

@@ -1132 +1132 @@
 char **_X13cfa_args_argvPPc_1;
 char **_X13cfa_args_envpPPc_1;
+signed int _X17cfa_main_returnedi_1 = ((signed int )0);
 signed int main(signed int _X4argci_1, char **_X4argvPPc_1, char **_X4envpPPc_1){
     __attribute__ ((unused)) signed int _X12_retval_maini_1;
@@ -1146 +1147 @@
     }
 
-    {
-        signed int _tmp_cp_ret6;
-        ((void)(_X12_retval_maini_1=(((void)(_tmp_cp_ret6=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret6)) /* ?{} */);
+    signed int _tmp_cp_ret6;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret6=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret6);
+    {
+        ((void)(_X17cfa_main_returnedi_1=((signed int )1)));
+    }
+
+    {
+        ((void)(_X12_retval_maini_1=_X3reti_2) /* ?{} */);
     }
 

tests/.expect/declarationSpecifier.x86.txt

@@ -1132 +1132 @@
 char **_X13cfa_args_argvPPc_1;
 char **_X13cfa_args_envpPPc_1;
+signed int _X17cfa_main_returnedi_1 = ((signed int )0);
 signed int main(signed int _X4argci_1, char **_X4argvPPc_1, char **_X4envpPPc_1){
     __attribute__ ((unused)) signed int _X12_retval_maini_1;
@@ -1146 +1147 @@
     }
 
-    {
-        signed int _tmp_cp_ret6;
-        ((void)(_X12_retval_maini_1=(((void)(_tmp_cp_ret6=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret6)) /* ?{} */);
+    signed int _tmp_cp_ret6;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret6=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret6);
+    {
+        ((void)(_X17cfa_main_returnedi_1=((signed int )1)));
+    }
+
+    {
+        ((void)(_X12_retval_maini_1=_X3reti_2) /* ?{} */);
     }
 

tests/.expect/gccExtensions.arm64.txt

@@ -324 +324 @@
 char **_X13cfa_args_argvPPc_1;
 char **_X13cfa_args_envpPPc_1;
+signed int _X17cfa_main_returnedi_1 = ((signed int )0);
 signed int main(signed int _X4argci_1, char **_X4argvPPc_1, char **_X4envpPPc_1){
     __attribute__ ((unused)) signed int _X12_retval_maini_1;
@@ -338 +339 @@
     }
 
-    {
-        signed int _tmp_cp_ret6;
-        ((void)(_X12_retval_maini_1=(((void)(_tmp_cp_ret6=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret6)) /* ?{} */);
+    signed int _tmp_cp_ret6;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret6=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret6);
+    {
+        ((void)(_X17cfa_main_returnedi_1=((signed int )1)));
+    }
+
+    {
+        ((void)(_X12_retval_maini_1=_X3reti_2) /* ?{} */);
     }
 

tests/.expect/gccExtensions.x64.txt

@@ -324 +324 @@
 char **_X13cfa_args_argvPPc_1;
 char **_X13cfa_args_envpPPc_1;
+signed int _X17cfa_main_returnedi_1 = ((signed int )0);
 signed int main(signed int _X4argci_1, char **_X4argvPPc_1, char **_X4envpPPc_1){
     __attribute__ ((unused)) signed int _X12_retval_maini_1;
@@ -338 +339 @@
     }
 
-    {
-        signed int _tmp_cp_ret6;
-        ((void)(_X12_retval_maini_1=(((void)(_tmp_cp_ret6=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret6)) /* ?{} */);
+    signed int _tmp_cp_ret6;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret6=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret6);
+    {
+        ((void)(_X17cfa_main_returnedi_1=((signed int )1)));
+    }
+
+    {
+        ((void)(_X12_retval_maini_1=_X3reti_2) /* ?{} */);
     }
 

tests/.expect/gccExtensions.x86.txt

@@ -302 +302 @@
 char **_X13cfa_args_argvPPc_1;
 char **_X13cfa_args_envpPPc_1;
+signed int _X17cfa_main_returnedi_1 = ((signed int )0);
 signed int main(signed int _X4argci_1, char **_X4argvPPc_1, char **_X4envpPPc_1){
     __attribute__ ((unused)) signed int _X12_retval_maini_1;
@@ -316 +317 @@
     }
 
-    {
-        signed int _tmp_cp_ret6;
-        ((void)(_X12_retval_maini_1=(((void)(_tmp_cp_ret6=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret6)) /* ?{} */);
+    signed int _tmp_cp_ret6;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret6=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret6);
+    {
+        ((void)(_X17cfa_main_returnedi_1=((signed int )1)));
+    }
+
+    {
+        ((void)(_X12_retval_maini_1=_X3reti_2) /* ?{} */);
     }
 

tests/Makefile.am

@@ -75 +75 @@
         pybin/tools.py \
         long_tests.hfa \
+        .in/parseconfig-all.txt \
+        .in/parseconfig-errors.txt \
+        .in/parseconfig-missing.txt \
         io/.in/io.data \
         io/.in/many_read.data \

tests/bitmanip3.cfa

@@ -10 +10 @@
 // Created On       : Tue Apr  7 21:22:59 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 24 09:53:26 2020
-// Update Count     : 66
+// Last Modified On : Sun Aug  8 23:12:19 2021
+// Update Count     : 76
 // 
 
@@ -133 +133 @@
         sout | nl | "floor2" | nl | nl;
 
-        printf( "signed char\n" );
+        sout | "signed char";
         for ( sc = 1; sc != 0; sc <<= 1 ) {
                 scr1 = floor2( sc, sc ); scr2 = floor2( sc + 2hh, sc ); scr3 = floor2( -sc - 2hh, sc );
-                printf( "floor2(%hhd, %hhd) = %hhd, floor2(%hhd, %hhd) = %hhd, floor2(%hhd, %hhd) = %hhd\n", sc, sc, scr1, sc + 2hh, sc, scr2, -sc - 2hh, sc, scr3 );
-        } // for
-        printf( "\n" );
-
-        printf( "unsigned char\n" );
+//              printf( "floor2(%hhd, %hhd) = %hhd, floor2(%hhd, %hhd) = %hhd, floor2(%hhd, %hhd) = %hhd\n", sc, sc, scr1, sc + 2hh, sc, scr2, -sc - 2hh, sc, scr3 );
+                sout | "floor2(" | sc | "," | sc | ") = " | scr1 | ", floor2(" | sc + 2hh | "," | sc | ") = " | scr2 | ", floor2(" | -sc - 2hh | "," | sc | ") = " | scr3;
+        } // for
+        sout | nl;
+
+        sout | "unsigned char";
         for ( uc = 1; uc != 0; uc <<= 1 ) {
                 ucr1 = floor2( uc, uc ); ucr2 = floor2( uc + 2hh, uc ); ucr3 = floor2( -uc - 2hh, uc );
-                printf( "floor2(%hhu, %hhu) = %hhu, floor2(%hhu, %hhu) = %hhu, floor2(%hhu, %hhu) = %hhu\n", uc, uc, ucr1, uc + 2uhh, uc, ucr2, -uc - 2uhh, uc, ucr3 );
-        } // for
-        printf( "\n" );
-
-        printf( "short int\n" );
+//              printf( "floor2(%hhu, %hhu) = %hhu, floor2(%hhu, %hhu) = %hhu, floor2(%hhu, %hhu) = %hhu\n", uc, uc, ucr1, uc + 2uhh, uc, ucr2, -uc - 2uhh, uc, ucr3 );
+                sout | "floor2(" | uc | "," | uc | ") = " | ucr1 | ", floor2(" | uc + 2uhh | "," | uc | ") = " | ucr2 | ", floor2(" | -uc - 2uhh | "," | uc | ") = " | ucr3;
+        } // for
+        sout | nl;
+
+        sout | "short int";
         for ( si = 1; si != 0; si <<= 1 ) {
                 sir1 = floor2( si, si ); sir2 = floor2( si + 2hh, si ); sir3 = floor2( -si - 2hh, si );
-                printf( "floor2(%hd, %hd) = %hd, floor2(%hd, %hd) = %hd, floor2(%hd, %hd) = %hd\n", si, si, sir1, si + 2h, si, sir2, -si - 2h, si, sir3 );
-        } // for
-        printf( "\n" );
-
-        printf( "unsigned short int\n" );
+//              printf( "floor2(%hd, %hd) = %hd, floor2(%hd, %hd) = %hd, floor2(%hd, %hd) = %hd\n", si, si, sir1, si + 2h, si, sir2, -si - 2h, si, sir3 );
+                sout | "floor2(" | si | "," | si | ") = " | sir1 | ", floor2(" | si + 2h | "," | si | ") = " | sir2 | ", floor2(" | -si - 2h | "," | si | ") = " | sir3;
+        } // for
+        sout | nl;
+
+        sout | "unsigned short int";
         for ( usi = 1; usi != 0; usi <<= 1 ) {
                 usir1 = floor2( usi, usi ); usir2 = floor2( usi + 2hh, usi ); usir3 = floor2( -usi - 2hh, usi );
-                printf( "floor2(%hu, %hu) = %hu, floor2(%hu, %hu) = %hu, floor2(%hu, %hu) = %hu\n", usi, usi, usir1, usi + 2uh, usi, usir2, -usi - 2uh, usi, usir3 );
-        } // for
-        printf( "\n" );
-
-        printf( "int\n" );
+//              printf( "floor2(%hu, %hu) = %hu, floor2(%hu, %hu) = %hu, floor2(%hu, %hu) = %hu\n", usi, usi, usir1, usi + 2uh, usi, usir2, -usi - 2uh, usi, usir3 );
+                sout | "floor2(" | usi | "," | usi | ") = " | usir1 | ", floor2(" | usi + 2uh | "," | usi | ") = " | usir2 | ", floor2(" | -usi - 2uh | "," | usi | ") = " | usir3;
+        } // for
+        sout | nl;
+
+        sout | "int";
         for ( i = 1; i != 0; i <<= 1 ) {
                 ir1 = floor2( i, i ); ir2 = floor2( i + 2hh, i ); ir3 = floor2( -i - 2hh, i );
-                printf( "floor2(%d, %d) = %d, floor2(%d, %d) = %d, floor2(%d, %d) = %d\n", i, i, ir1, i + 2h, i, ir2, -i - 2h, i, ir3 );
-        } // for
-        printf( "\n" );
-
-        printf( "unsigned int\n" );
+//              printf( "floor2(%d, %d) = %d, floor2(%d, %d) = %d, floor2(%d, %d) = %d\n", i, i, ir1, i + 2, i, ir2, -i - 2, i, ir3 );
+                sout | "floor2(" | i | "," | i | ") = " | ir1 | ", floor2(" | i + 2 | "," | i | ") = " | ir2 | ", floor2(" | -i - 2 | "," | i | ") = " | ir3;
+        } // for
+        sout | nl;
+
+        sout | "unsigned int";
         for ( ui = 1; ui != 0; ui <<= 1 ) {
                 uir1 = floor2( ui, ui ); uir2 = floor2( ui + 2hh, ui ); uir3 = floor2( -ui - 2hh, ui );
-                printf( "floor2(%u, %u) = %u, floor2(%u, %u) = %u, floor2(%u, %u) = %u\n", ui, ui, uir1, ui + 2h, ui, uir2, -ui - 2h, ui, uir3 );
-        } // for
-        printf( "\n" );
-
-        printf( "long int\n" );
+//              printf( "floor2(%u, %u) = %u, floor2(%u, %u) = %u, floor2(%u, %u) = %u\n", ui, ui, uir1, ui + 2, ui, uir2, -ui - 2, ui, uir3 );
+                sout | "floor2(" | ui | "," | ui | ") = " | uir1 | ", floor2(" | ui + 2 | "," | ui | ") = " | uir2 | ", floor2(" | -ui - 2 | "," | ui | ") = " | uir3;
+        } // for
+        sout | nl;
+
+        sout | "long int";
         for ( li = 1; li != 0; li <<= 1 ) {
                 lir1 = floor2( li, li ); lir2 = floor2( li + 2hh, li ); lir3 = floor2( -li - 2hh, li );
-                printf( "floor2(%ld, %ld) = %ld, floor2(%ld, %ld) = %ld, floor2(%ld, %ld) = %ld\n", li, li, lir1, li + 2h, li, lir2, -li - 2h, li, lir3 );
-        } // for
-        printf( "\n" );
-
-        printf( "unsigned long int\n" );
+//              printf( "floor2(%ld, %ld) = %ld, floor2(%ld, %ld) = %ld, floor2(%ld, %ld) = %ld\n", li, li, lir1, li + 2l, li, lir2, -li - 2l, li, lir3 );
+                sout | "floor2(" | li | "," | li | ") = " | lir1 | ", floor2(" | li + 2l | "," | li | ") = " | lir2 | ", floor2(" | -li - 2l | "," | li | ") = " | lir3;
+        } // for
+        sout | nl;
+
+        sout | "unsigned long int";
         for ( uli = 1; uli != 0; uli <<= 1 ) {
                 ulir1 = floor2( uli, uli ); ulir2 = floor2( uli + 2hh, uli ); ulir3 = floor2( -uli - 2hh, uli );
-                printf( "floor2(%lu, %lu) = %lu, floor2(%lu, %lu) = %lu, floor2(%lu, %lu) = %lu\n", uli, uli, ulir1, uli + 2h, uli, ulir2, -uli - 2h, uli, ulir3 );
-        } // for
-        printf( "\n" );
-
-        printf( "long long int\n" );
+//              printf( "floor2(%lu, %lu) = %lu, floor2(%lu, %lu) = %lu, floor2(%lu, %lu) = %lu\n", uli, uli, ulir1, uli + 2l, uli, ulir2, -uli - 2l, uli, ulir3 );
+                sout | "floor2(" | uli | "," | uli | ") = " | ulir1 | ", floor2(" | uli + 2l | "," | uli | ") = " | ulir2 | ", floor2(" | -uli - 2l | "," | uli | ") = " | ulir3;
+        } // for
+        sout | nl;
+
+        sout | "long long int";
         for ( lli = 1; lli != 0; lli <<= 1 ) {
                 llir1 = floor2( lli, lli ); llir2 = floor2( lli + 2hh, lli ); llir3 = floor2( -lli - 2hh, lli );
-                printf( "floor2(%lld, %lld) = %lld, floor2(%lld, %lld) = %lld, floor2(%lld, %lld) = %lld\n", lli, lli, llir1, lli + 2h, lli, llir2, -lli - 2h, lli, llir3 );
-        } // for
-        printf( "\n" );
-
-        printf( "unsigned long long int\n" );
+//              printf( "floor2(%lld, %lld) = %lld, floor2(%lld, %lld) = %lld, floor2(%lld, %lld) = %lld\n", lli, lli, llir1, lli + 2ll, lli, llir2, -lli - 2ll, lli, llir3 );
+                sout | "floor2(" | lli | "," | lli | ") = " | llir1 | ", floor2(" | lli + 2ll | "," | lli | ") = " | llir2 | ", floor2(" | -lli - 2ll | "," | lli | ") = " | llir3;
+        } // for
+        sout | nl;
+
+        sout | "unsigned long long int";
         for ( ulli = 1; ulli != 0; ulli <<= 1 ) {
                 ullir1 = floor2( ulli, ulli ); ullir2 = floor2( ulli + 2hh, ulli ); ullir3 = floor2( -ulli - 2hh, ulli );
-                printf( "floor2(%llu, %llu) = %llu, floor2(%llu, %llu) = %llu, floor2(%llu, %llu) = %llu\n", ulli, ulli, ullir1, ulli + 2h, ulli, ullir2, -ulli - 2h, ulli, ullir3 );
-        } // for
-        printf( "\n" );
+//              printf( "floor2(%llu, %llu) = %llu, floor2(%llu, %llu) = %llu, floor2(%llu, %llu) = %llu\n", ulli, ulli, ullir1, ulli + 2h, ulli, ullir2, -ulli - 2h, ulli, ullir3 );
+                sout | "floor2(" | ulli | "," | ulli | ") = " | ullir1 | ", floor2(" | ulli + 2ll | "," | ulli | ") = " | ullir2 | ", floor2(" | -ulli - 2ll | "," | ulli | ") = " | ullir3;
+        } // for
+        sout | nl;
 #endif // 0
         //============================================================
@@ -207 +217 @@
         sout | nl | "ceiling2" | nl | nl;
 
-        printf( "signed char\n" );
+        sout | "signed char";
         for ( sc = 1; sc != 0; sc <<= 1 ) {
                 scr1 = ceiling2( sc, sc ); scr2 = ceiling2( sc + 2hh, sc ); scr3 = ceiling2( -sc - 2hh, sc );
-                printf( "ceiling2(%hhd, %hhd) = %hhd, ceiling2(%hhd, %hhd) = %hhd, ceiling2(%hhd, %hhd) = %hhd\n", sc, sc, scr1, sc + 2hh, sc, scr2, -sc - 2hh, sc, scr3 );
-        } // for
-        printf( "\n" );
-
-        printf( "unsigned char\n" );
+//              printf( "ceiling2(%hhd, %hhd) = %hhd, ceiling2(%hhd, %hhd) = %hhd, ceiling2(%hhd, %hhd) = %hhd\n", sc, sc, scr1, sc + 2hh, sc, scr2, -sc - 2hh, sc, scr3 );
+                sout | "ceiling2(" | sc | "," | sc | ") = " | scr1 | ", ceiling2(" | sc + 2hh | "," | sc | ") = " | scr2 | ", ceiling2(" | -sc - 2hh | "," | sc | ") = " | scr3;
+        } // for
+        sout | nl;
+
+        sout | "unsigned char";
         for ( uc = 1; uc != 0; uc <<= 1 ) {
                 ucr1 = ceiling2( uc, uc ); ucr2 = ceiling2( uc + 2hh, uc ); ucr3 = ceiling2( -uc - 2hh, uc );
-                printf( "ceiling2(%hhu, %hhu) = %hhu, ceiling2(%hhu, %hhu) = %hhu, ceiling2(%hhu, %hhu) = %hhu\n", uc, uc, ucr1, uc + 2uhh, uc, ucr2, -uc - 2uhh, uc, ucr3 );
-        } // for
-        printf( "\n" );
-
-        printf( "short int\n" );
+//              printf( "ceiling2(%hhu, %hhu) = %hhu, ceiling2(%hhu, %hhu) = %hhu, ceiling2(%hhu, %hhu) = %hhu\n", uc, uc, ucr1, uc + 2uhh, uc, ucr2, -uc - 2uhh, uc, ucr3 );
+                sout | "ceiling2(" | uc | "," | uc | ") = " | ucr1 | ", ceiling2(" | uc + 2hh | "," | uc | ") = " | ucr2 | ", ceiling2(" | -uc - 2hh | "," | uc | ") = " | ucr3;
+        } // for
+        sout | nl;
+
+        sout | "short int";
         for ( si = 1; si != 0; si <<= 1 ) {
                 sir1 = ceiling2( si, si ); sir2 = ceiling2( si + 2hh, si ); sir3 = ceiling2( -si - 2hh, si );
-                printf( "ceiling2(%hd, %hd) = %hd, ceiling2(%hd, %hd) = %hd, ceiling2(%hd, %hd) = %hd\n", si, si, sir1, si + 2h, si, sir2, -si - 2h, si, sir3 );
-        } // for
-        printf( "\n" );
-
-        printf( "unsigned short int\n" );
+//              printf( "ceiling2(%hd, %hd) = %hd, ceiling2(%hd, %hd) = %hd, ceiling2(%hd, %hd) = %hd\n", si, si, sir1, si + 2h, si, sir2, -si - 2h, si, sir3 );
+                sout | "ceiling2(" | si | "," | si | ") = " | sir1 | ", ceiling2(" | si + 2h | "," | si | ") = " | sir2 | ", ceiling2(" | -si - 2h | "," | si | ") = " | sir3;
+        } // for
+        sout | nl;
+
+        sout | "unsigned short int";
         for ( usi = 1; usi != 0; usi <<= 1 ) {
                 usir1 = ceiling2( usi, usi ); usir2 = ceiling2( usi + 2hh, usi ); usir3 = ceiling2( -usi - 2hh, usi );
-                printf( "ceiling2(%hu, %hu) = %hu, ceiling2(%hu, %hu) = %hu, ceiling2(%hu, %hu) = %hu\n", usi, usi, usir1, usi + 2uh, usi, usir2, -usi - 2uh, usi, usir3 );
-        } // for
-        printf( "\n" );
-
-        printf( "int\n" );
+//              printf( "ceiling2(%hu, %hu) = %hu, ceiling2(%hu, %hu) = %hu, ceiling2(%hu, %hu) = %hu\n", usi, usi, usir1, usi + 2uh, usi, usir2, -usi - 2uh, usi, usir3 );
+                sout | "ceiling2(" | usi | "," | usi | ") = " | usir1 | ", ceiling2(" | usi + 2h | "," | usi | ") = " | usir2 | ", ceiling2(" | -usi - 2h | "," | usi | ") = " | usir3;
+        } // for
+        sout | nl;
+
+        sout | "int";
         for ( i = 1; i != 0; i <<= 1 ) {
                 ir1 = ceiling2( i, i ); ir2 = ceiling2( i + 2hh, i ); ir3 = ceiling2( -i - 2hh, i );
-                printf( "ceiling2(%d, %d) = %d, ceiling2(%d, %d) = %d, ceiling2(%d, %d) = %d\n", i, i, ir1, i + 2h, i, ir2, -i - 2h, i, ir3 );
-        } // for
-        printf( "\n" );
-
-        printf( "unsigned int\n" );
+//              printf( "ceiling2(%d, %d) = %d, ceiling2(%d, %d) = %d, ceiling2(%d, %d) = %d\n", i, i, ir1, i + 2, i, ir2, -i - 2, i, ir3 );
+                sout | "ceiling2(" | i | "," | i | ") = " | ir1 | ", ceiling2(" | i + 2 | "," | i | ") = " | ir2 | ", ceiling2(" | -i - 2 | "," | i | ") = " | ir3;
+        } // for
+        sout | nl;
+
+        sout | "unsigned int";
         for ( ui = 1; ui != 0; ui <<= 1 ) {
                 uir1 = ceiling2( ui, ui ); uir2 = ceiling2( ui + 2hh, ui ); uir3 = ceiling2( -ui - 2hh, ui );
-                printf( "ceiling2(%u, %u) = %u, ceiling2(%u, %u) = %u, ceiling2(%u, %u) = %u\n", ui, ui, uir1, ui + 2h, ui, uir2, -ui - 2h, ui, uir3 );
-        } // for
-        printf( "\n" );
-
-        printf( "long int\n" );
+//              printf( "ceiling2(%u, %u) = %u, ceiling2(%u, %u) = %u, ceiling2(%u, %u) = %u\n", ui, ui, uir1, ui + 2, ui, uir2, -ui - 2, ui, uir3 );
+                sout | "ceiling2(" | ui | "," | ui | ") = " | uir1 | ", ceiling2(" | ui + 2 | "," | ui | ") = " | uir2 | ", ceiling2(" | -ui - 2 | "," | ui | ") = " | uir3;
+        } // for
+        sout | nl;
+
+        sout | "long int";
         for ( li = 1; li != 0; li <<= 1 ) {
                 lir1 = ceiling2( li, li ); lir2 = ceiling2( li + 2hh, li ); lir3 = ceiling2( -li - 2hh, li );
-                printf( "ceiling2(%ld, %ld) = %ld, ceiling2(%ld, %ld) = %ld, ceiling2(%ld, %ld) = %ld\n", li, li, lir1, li + 2h, li, lir2, -li - 2h, li, lir3 );
-        } // for
-        printf( "\n" );
-
-        printf( "unsigned long int\n" );
+//              printf( "ceiling2(%ld, %ld) = %ld, ceiling2(%ld, %ld) = %ld, ceiling2(%ld, %ld) = %ld\n", li, li, lir1, li + 2l, li, lir2, -li - 2l, li, lir3 );
+                sout | "ceiling2(" | li | "," | li | ") = " | lir1 | ", ceiling2(" | li + 2l | "," | li | ") = " | lir2 | ", ceiling2(" | -li - 2l | "," | li | ") = " | lir3;
+        } // for
+        sout | nl;
+
+        sout | "unsigned long int";
         for ( uli = 1; uli != 0; uli <<= 1 ) {
                 ulir1 = ceiling2( uli, uli ); ulir2 = ceiling2( uli + 2hh, uli ); ulir3 = ceiling2( -uli - 2hh, uli );
-                printf( "ceiling2(%lu, %lu) = %lu, ceiling2(%lu, %lu) = %lu, ceiling2(%lu, %lu) = %lu\n", uli, uli, ulir1, uli + 2h, uli, ulir2, -uli - 2h, uli, ulir3 );
-        } // for
-        printf( "\n" );
-
-        printf( "long long int\n" );
+//              printf( "ceiling2(%lu, %lu) = %lu, ceiling2(%lu, %lu) = %lu, ceiling2(%lu, %lu) = %lu\n", uli, uli, ulir1, uli + 2, uli, ulir2, -uli - 2, uli, ulir3 );
+                sout | "ceiling2(" | uli | "," | uli | ") = " | ulir1 | ", ceiling2(" | uli + 2l | "," | uli | ") = " | ulir2 | ", ceiling2(" | -uli - 2l | "," | uli | ") = " | ulir3;
+        } // for
+        sout | nl;
+
+        sout | "long long int";
         for ( lli = 1; lli != 0; lli <<= 1 ) {
                 llir1 = ceiling2( lli, lli ); llir2 = ceiling2( lli + 2hh, lli ); llir3 = ceiling2( -lli - 2hh, lli );
-                printf( "ceiling2(%lld, %lld) = %lld, ceiling2(%lld, %lld) = %lld, ceiling2(%lld, %lld) = %lld\n", lli, lli, llir1, lli + 2h, lli, llir2, -lli - 2h, lli, llir3 );
-        } // for
-        printf( "\n" );
-
-        printf( "unsigned long long int\n" );
+//              printf( "ceiling2(%lld, %lld) = %lld, ceiling2(%lld, %lld) = %lld, ceiling2(%lld, %lld) = %lld\n", lli, lli, llir1, lli + 2ll, lli, llir2, -lli - 2ll, lli, llir3 );
+                sout | "ceiling2(" | lli | "," | lli | ") = " | llir1 | ", ceiling2(" | lli + 2ll | "," | lli | ") = " | llir2 | ", ceiling2(" | -lli - 2ll | "," | lli | ") = " | llir3;
+        } // for
+        sout | nl;
+
+        sout | "unsigned long long int";
         for ( ulli = 1; ulli != 0; ulli <<= 1 ) {
                 ullir1 = ceiling2( ulli, ulli ); ullir2 = ceiling2( ulli + 2hh, ulli ); ullir3 = ceiling2( -ulli - 2hh, ulli );
-                printf( "ceiling2(%llu, %llu) = %llu, ceiling2(%llu, %llu) = %llu, ceiling2(%llu, %llu) = %llu\n", ulli, ulli, ullir1, ulli + 2h, ulli, ullir2, -ulli - 2h, ulli, ullir3 );
-        } // for
-        printf( "\n" );
+//              printf( "ceiling2(%llu, %llu) = %llu, ceiling2(%llu, %llu) = %llu, ceiling2(%llu, %llu) = %llu\n", ulli, ulli, ullir1, ulli + 2h, ulli, ullir2, -ulli - 2h, ulli, ullir3 );
+                sout | "ceiling2(" | ulli | "," | ulli | ") = " | ullir1 | ", ceiling2(" | ulli + 2ll | "," | ulli | ") = " | ullir2 | ", ceiling2(" | -ulli - 2ll | "," | ulli | ") = " | ullir3;
+        } // for
+        sout | nl;
 #endif // 0
 } // main

tests/exceptions/.expect/type-check.txt

@@ -1 @@
-exceptions/type-check.cfa:8:1 error: catch must have pointer to an exception type
-exceptions/type-check.cfa:9:1 error: catch must have pointer to an exception type
-exceptions/type-check.cfa:10:1 error: catchResume must have pointer to an exception type
-exceptions/type-check.cfa:11:1 error: catchResume must have pointer to an exception type
+exceptions/type-check.cfa:6:1 error: catch must have pointer to an exception type
+exceptions/type-check.cfa:7:1 error: catch must have pointer to an exception type
+exceptions/type-check.cfa:8:1 error: catchResume must have pointer to an exception type
+exceptions/type-check.cfa:9:1 error: catchResume must have pointer to an exception type

tests/exceptions/cancel/coroutine.cfa

@@ -2 +2 @@
 
 #include <coroutine.hfa>
-#include <exception.hfa>
 
-EHM_EXCEPTION(internal_error)();
-EHM_VIRTUAL_TABLE(internal_error, internal_vt);
+exception internal_error {};
+vtable(internal_error) internal_vt;
 
 coroutine WillCancel {};

tests/exceptions/cancel/thread.cfa

@@ -2 +2 @@
 
 #include <thread.hfa>
-#include <exception.hfa>
 
-EHM_EXCEPTION(internal_error)();
-EHM_VIRTUAL_TABLE(internal_error, internal_vt);
+exception internal_error {};
+vtable(internal_error) internal_vt;
 
 thread WillCancel {};

tests/exceptions/conditional.cfa

@@ -4 +4 @@
 // up the non-trivial exception is reasonable to do.
 
-#include <exception.hfa>
+exception num_error {
+        int num;
+};
 
-EHM_EXCEPTION(num_error)(
-        int num;
-);
-
-EHM_VIRTUAL_TABLE(num_error, num_error_vt);
+vtable(num_error) num_error_vt;
 
 void caught_num_error(int expect, num_error * actual) {

tests/exceptions/data-except.cfa

@@ -1 +1 @@
 // Test exceptions that add data but no functionality.
 
-#include <exception.hfa>
-
-EHM_EXCEPTION(paired)(
+exception paired {
         int first;
         int second;
-);
+};
 
-EHM_VIRTUAL_TABLE(paired, paired_vt);
+vtable(paired) paired_vt;
 
 const char * virtual_msg(paired * this) {

tests/exceptions/defaults.cfa

@@ -4 +4 @@
 #include <exception.hfa>
 
-EHM_EXCEPTION(log_message)(
+exception log_message {
         char * msg;
-);
+};
 
 _EHM_DEFINE_COPY(log_message, )
@@ -32 +32 @@
 
 // I don't have a good use case for doing the same with termination.
-EHM_EXCEPTION(jump)();
+exception jump {};
 void defaultTerminationHandler(jump &) {
         printf("jump default handler.\n");
 }
 
-EHM_VIRTUAL_TABLE(jump, jump_vt);
+vtable(jump) jump_vt;
 
 void jump_test(void) {
@@ -48 +48 @@
 }
 
-EHM_EXCEPTION(first)();
-EHM_VIRTUAL_TABLE(first, first_vt);
+exception first {};
+vtable(first) first_vt;
 
-EHM_EXCEPTION(unhandled_exception)();
-EHM_VIRTUAL_TABLE(unhandled_exception, unhandled_vt);
+exception unhandled_exception {};
+vtable(unhandled_exception) unhandled_vt;
 
 void unhandled_test(void) {
@@ -69 +69 @@
 }
 
-EHM_EXCEPTION(second)();
-EHM_VIRTUAL_TABLE(second, second_vt);
+exception second {};
+vtable(second) second_vt;
 
 void cross_test(void) {

tests/exceptions/finally.cfa

@@ -1 +1 @@
 // Finally Clause Tests
 
-#include <exception.hfa>
 #include "except-io.hfa"
 
-EHM_EXCEPTION(myth)();
+exception myth {};
 
-EHM_VIRTUAL_TABLE(myth, myth_vt);
+vtable(myth) myth_vt;
 
 int main(int argc, char * argv[]) {

tests/exceptions/interact.cfa

@@ -1 +1 @@
 // Testing Interactions Between Termination and Resumption
 
-#include <exception.hfa>
 #include "except-io.hfa"
 
-EHM_EXCEPTION(star)();
-EHM_EXCEPTION(moon)();
+exception star {};
+exception moon {};
 
-EHM_VIRTUAL_TABLE(star, star_vt);
-EHM_VIRTUAL_TABLE(moon, moon_vt);
+vtable(star) star_vt;
+vtable(moon) moon_vt;
 
 int main(int argc, char * argv[]) {

tests/exceptions/polymorphic.cfa

@@ -1 +1 @@
 // Testing polymophic exception types.
 
-#include <exception.hfa>
+forall(T &) exception proxy {};
 
-EHM_FORALL_EXCEPTION(proxy, (T&), (T))();
-
-EHM_FORALL_VIRTUAL_TABLE(proxy, (int), proxy_int);
-EHM_FORALL_VIRTUAL_TABLE(proxy, (char), proxy_char);
+vtable(proxy(int)) proxy_int;
+vtable(proxy(char)) proxy_char;
 
 void proxy_test(void) {
@@ -33 +31 @@
 }
 
-EHM_FORALL_EXCEPTION(cell, (T), (T))(
+forall(T) exception cell {
         T data;
-);
+};
 
-EHM_FORALL_VIRTUAL_TABLE(cell, (int), int_cell);
-EHM_FORALL_VIRTUAL_TABLE(cell, (char), char_cell);
-EHM_FORALL_VIRTUAL_TABLE(cell, (bool), bool_cell);
+vtable(cell(int)) int_cell;
+vtable(cell(char)) char_cell;
+vtable(cell(bool)) bool_cell;
 
 void cell_test(void) {

tests/exceptions/resume.cfa

@@ -1 +1 @@
 // Resumption Exception Tests
 
-#include <exception.hfa>
 #include "except-io.hfa"
 
-EHM_EXCEPTION(yin)();
-EHM_EXCEPTION(yang)();
-EHM_EXCEPTION(zen)();
+exception yin {};
+exception yang {};
+exception zen {};
 
-EHM_VIRTUAL_TABLE(yin, yin_vt);
-EHM_VIRTUAL_TABLE(yang, yang_vt);
-EHM_VIRTUAL_TABLE(zen, zen_vt);
+vtable(yin) yin_vt;
+vtable(yang) yang_vt;
+vtable(zen) zen_vt;
 
 void in_void(void);

tests/exceptions/terminate.cfa

@@ -1 +1 @@
 // Termination Exception Tests
 
-#include <exception.hfa>
 #include "except-io.hfa"
 
-EHM_EXCEPTION(yin)();
-EHM_EXCEPTION(yang)();
-EHM_EXCEPTION(zen)();
+exception yin {};
+exception yang {};
+exception zen {};
 
-EHM_VIRTUAL_TABLE(yin, yin_vt);
-EHM_VIRTUAL_TABLE(yang, yang_vt);
-EHM_VIRTUAL_TABLE(zen, zen_vt);
+vtable(yin) yin_vt;
+vtable(yang) yang_vt;
+vtable(zen) zen_vt;
 
 void in_void(void);

tests/exceptions/trash.cfa

@@ -1 +1 @@
 // Make sure throw-catch during unwind does not trash internal data.
 
-#include <exception.hfa>
+exception yin {};
+exception yang {};
 
-EHM_EXCEPTION(yin)();
-EHM_EXCEPTION(yang)();
-
-EHM_VIRTUAL_TABLE(yin, yin_vt);
-EHM_VIRTUAL_TABLE(yang, yang_vt);
+vtable(yin) yin_vt;
+vtable(yang) yang_vt;
 
 int main(int argc, char * argv[]) {

tests/exceptions/type-check.cfa

@@ -1 +1 @@
 // Check that the exception type check works.
 
-#include <exception.hfa>
-
-EHM_EXCEPTION(truth)();
+exception truth {};
 
 int main(int argc, char * argv[]) {

tests/mathX.cfa

@@ -10 +10 @@
 // Created On       : Thu May 24 20:56:54 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb 20 18:26:38 2021
-// Update Count     : 30
+// Last Modified On : Sun Aug  8 22:33:46 2021
+// Update Count     : 31
 //
 
@@ -255 +255 @@
                 sout | "ceiling(" | ulli | ", " | ulli | ") = " | ullir1 | ", ceiling(" | ulli + 2ull | ", " | ulli | ") = " | ullir2 | ", ceiling(" | -ulli - 2ull | ", " | ulli | ") = " | ullir3;
         } // for
-        printf( "\n" );
+        sout | nl;
 #endif // 0
 } // main