Changeset c8ec58e for tests

Timestamp:

Sep 11, 2023, 12:55:49 PM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

c0035fc

Parents:

9509d67a (diff), 73d0a84c (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:

• concurrency/waituntil/locks.cfa (modified) (1 diff)
• exceptions/.expect/finally-error.txt (deleted)
• exceptions/.expect/try-ctrl-flow.txt (added)
• exceptions/try-ctrl-flow.cfa (moved) (moved from tests/exceptions/finally-error.cfa ) (2 diffs)
• io/.expect/manipulatorsInput.arm64.txt (modified) (1 diff)
• io/.expect/manipulatorsInput.x64.txt (modified) (1 diff)
• io/.expect/manipulatorsInput.x86.txt (modified) (1 diff)
• io/.in/manipulatorsInput.txt (modified) (1 diff)
• io/manipulatorsInput.cfa (modified) (1 diff)

tests/concurrency/waituntil/locks.cfa

@@ -73 +73 @@
     printf("done\n");
 }
+

tests/exceptions/try-ctrl-flow.cfa

@@ -1 @@
-// All of these should be caught as long as the check remains in the same
-// pass. (Although not even all of the checks are in place yet.)
+// Check all the local control flow structures that are "sealed" by some the
+// try statement clauses; where structured programming is stricter.
 
 void break_in_finally() {
@@ -151 +151 @@
 }
 
+// Now just use return to test the other try control flow interactions.
+
+exception nil_exception {};
+
+void return_in_try_with_catch() {
+        try {
+                return;
+        } catch (nil_exception *) {
+                ;
+        }
+}
+
+// Allowed.
+void return_in_try_with_catchReturn() {
+        try {
+                return;
+        } catchResume (nil_exception *) {
+                ;
+        }
+}
+
+// Allowed.
+void return_in_try_with_finally() {
+        try {
+                return;
+        } finally {
+                ;
+        }
+}
+
+void return_in_catch() {
+        try {
+                ;
+        } catch (nil_exception *) {
+                return;
+        }
+}
+
+void return_in_catchResume() {
+        try {
+                ;
+        } catchResume (nil_exception *) {
+                return;
+        }
+}
+
 void main() {
         // Should not compile.

tests/io/.expect/manipulatorsInput.arm64.txt

@@ +1 @@
+pre1 "123456", canary ok
+pre2a "1234567", exception occurred, canary ok
+pre2b "89", canary ok
 1 yyyyyyyyyyyyyyyyyyyy
 2 abcxxx

tests/io/.expect/manipulatorsInput.x64.txt

@@ +1 @@
+pre1 "123456", canary ok
+pre2a "1234567", exception occurred, canary ok
+pre2b "89", canary ok
 1 yyyyyyyyyyyyyyyyyyyy
 2 abcxxx

tests/io/.expect/manipulatorsInput.x86.txt

@@ +1 @@
+pre1 "123456", canary ok
+pre2a "1234567", exception occurred, canary ok
+pre2b "89", canary ok
 1 yyyyyyyyyyyyyyyyyyyy
 2 abcxxx

tests/io/.in/manipulatorsInput.txt

@@ +1 @@
+123456
+123456789
 abc 
 abc 

tests/io/manipulatorsInput.cfa

@@ -15 +15 @@
 
 int main() {
+        {
+                // Upfront checks to ensure buffer safety.  Once these pass, the simpler `wdi(sizeof(s),s)`
+                // usage, as in the scanf alignment cases below, is justified.
+                struct {
+                        char buf[8];
+                        char canary;
+                } data;
+                static_assert( sizeof(data.buf) == 8 );
+                static_assert( &data.buf[8] == &data.canary );  // canary comes right after buf
+
+                void rep(const char* casename) {
+                        data.canary = 42;
+                        bool caught = false;
+                        try {
+                                sin | wdi( sizeof(data.buf), data.buf );
+                        } catch (cstring_length*) {
+                                caught = true;
+                        }
+                        printf( "%s \"%s\"", casename, data.buf );
+                        if ( caught ) {
+                                printf(", exception occurred");
+                        }
+                        if ( data.canary == 42 ) {
+                                printf(", canary ok");
+                        } else {
+                                printf(", canary overwritten to %d", data.canary);
+                        }
+                        printf("\n");
+                }
+
+                rep("pre1");
+                rep("pre2a");
+                rep("pre2b");
+                scanf("\n");  // next test does not start with %s so does not tolerate leading whitespace
+        }
         {
                 char s[] = "yyyyyyyyyyyyyyyyyyyy";