Changeset d9f6d80 for tests/exceptions

Timestamp:

Dec 20, 2024, 3:35:35 PM (5 weeks ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

9dc05782

Parents:

77148b0 (diff), 5251c6b (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:

• cancel/coroutine.cfa (modified) (2 diffs)
• cancel/thread.cfa (modified) (2 diffs)
• conditional.cfa (modified) (1 diff)
• data-except.cfa (modified) (1 diff)
• defaults.cfa (modified) (1 diff)
• except-io.hfa (modified) (2 diffs)
• finally.cfa (modified) (1 diff)
• interact.cfa (modified) (1 diff)
• polymorphic.cfa (modified) (1 diff)
• resume.cfa (modified) (1 diff)
• terminate.cfa (modified) (1 diff)
• trash.cfa (modified) (1 diff)
• try-ctrl-flow.cfa (modified) (1 diff)
• try-leave-catch.cfa (modified) (1 diff)
• virtual-cast.cfa (modified) (1 diff)

tests/exceptions/cancel/coroutine.cfa

@@ -9 +9 @@
 coroutine WillCancel {};
 
-const char * msg(CoroutineCancelled(WillCancel) * this) {
+const char * msg(CoroutineCancelled(WillCancel) *) {
         return "CoroutineCancelled(WillCancel)";
 }
 
-void main(WillCancel & wc) {
+void main(WillCancel &) {
         sout | '1';
         cancel_stack((internal_error){&internal_vt});
@@ -19 +19 @@
 }
 
-int main(int argc, char * argv[]) {
+int main() {
         sout | nlOff;
         WillCancel cancel;

tests/exceptions/cancel/thread.cfa

@@ -9 +9 @@
 thread WillCancel {};
 
-const char * msg(ThreadCancelled(WillCancel) * this) {
+const char * msg(ThreadCancelled(WillCancel) *) {
         return "ThreadCancelled(WillCancel)";
 }
@@ -52 +52 @@
 }
 
-int main(int argc, char * argv[]) {
+int main() {
         sout | nlOff;
         explicit();

tests/exceptions/conditional.cfa

@@ -16 +16 @@
 }
 
-int main(int argc, char * argv[]) {
+int main() {
         num_error exc = {&num_error_vt, 2};
 

tests/exceptions/data-except.cfa

@@ -14 +14 @@
 }
 
-int main(int argc, char * argv[]) {
+int main() {
         paired except = {&paired_vt, 3, 13};
 

tests/exceptions/defaults.cfa

@@ -106 +106 @@
 }
 
-int main(int argc, char * argv[]) {
+int main() {
         log_test();
         jump_test();

tests/exceptions/except-io.hfa

@@ -9 +9 @@
 };
 
-inline void ?{}(loud_exit & this, const char * area) {
+static inline void ?{}(loud_exit & this, const char * area) {
     this.area = area;
 }
 
-inline void ^?{}(loud_exit & this) {
+static inline void ^?{}(loud_exit & this) {
     sout | "Exiting: " | this.area;
 }
@@ -21 +21 @@
 };
 
-inline void ?{}(loud_region & this, const char * region) {
+static inline void ?{}(loud_region & this, const char * region) {
         this.region = region;
         sout | "Entering: " | region;
 }
 
-inline void ^?{}(loud_region & this) {
+static inline void ^?{}(loud_region & this) {
         sout | "Exiting: " | this.region;
 }

tests/exceptions/finally.cfa

@@ -8 +8 @@
 vtable(myth) myth_vt;
 
-int main(int argc, char * argv[]) {
+int main() {
         myth exc = {&myth_vt};
 

tests/exceptions/interact.cfa

@@ -10 +10 @@
 vtable(moon) moon_vt;
 
-int main(int argc, char * argv[]) {
+int main() {
         // Resume falls back to terminate.
         try {

tests/exceptions/polymorphic.cfa

@@ -59 +59 @@
 }
 
-int main(int argc, char * argv[]) {
+int main() {
         proxy_test();
         sout | nl;

tests/exceptions/resume.cfa

@@ -14 +14 @@
 void in_void(void);
 
-int main(int argc, char * argv[]) {
+int main() {
         yin a_yin = {&yin_vt};
         yang a_yang = {&yang_vt};

tests/exceptions/terminate.cfa

@@ -14 +14 @@
 void in_void(void);
 
-int main(int argc, char * argv[]) {
+int main() {
         yin a_yin = {&yin_vt};
         yang a_yang = {&yang_vt};

tests/exceptions/trash.cfa

@@ -9 +9 @@
 vtable(yang) yang_vt;
 
-int main(int argc, char * argv[]) {
+int main() {
         try {
                 try {

tests/exceptions/try-ctrl-flow.cfa

@@ -189 +189 @@
 }
 
-void main() {
+int main() {
         // Should not compile.
         return 1;

tests/exceptions/try-leave-catch.cfa

@@ -53 +53 @@
 }
 
-int main(int argc, char * argv[]) {
+int main() {
         test_loop();
         test_switch();

tests/exceptions/virtual-cast.cfa

@@ -93 +93 @@
 }
 
-int main (int argc, char * argv[]) {
-
+int main() {
         gamma * tri = malloc(); tri->virtual_table = &_gamma_vtable_instance;
         beta * mid = (virtual beta *)tri;