Changeset f1b6671 for tests

Timestamp:

Apr 6, 2020, 4:41:55 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

e276be6

Parents:

057298e

Message:

Unwinding is now handled in exception handling code. That is used to fix one bug, other exception tests added. Noise from the change altered one other test.

Location:

tests

Files:

• errors/.expect/completeType.txt (modified) (2 diffs)
• exceptions/.expect/interact.txt (modified) (1 diff)
• exceptions/.expect/resume.txt (modified) (1 diff)
• exceptions/.expect/terminate.txt (modified) (1 diff)
• exceptions/interact.cfa (modified) (2 diffs)
• exceptions/resume.cfa (modified) (1 diff)
• exceptions/terminate.cfa (modified) (1 diff)

tests/errors/.expect/completeType.txt

@@ -27 +27 @@
     void 
   )
-  Environment:( _85_4_DT ) -> instance of struct A with body 0 (no widening)
+  Environment:( _85_2_DT ) -> instance of struct A with body 0 (no widening)
 
 
@@ -50 +50 @@
     void 
   )
-  Environment:( _85_4_DT ) -> instance of struct B with body 1 (no widening)
+  Environment:( _85_2_DT ) -> instance of struct B with body 1 (no widening)
 
 

tests/exceptions/.expect/interact.txt

@@ -14 +14 @@
 resumption catch, will terminate
 inner termination catch
+
+throwing resume moon
+resumption moon catch, will terminate
+termination catch
+throwing resume star
+resumption star catch

tests/exceptions/.expect/resume.txt

@@ -25 +25 @@
 caught second exception
 recaught first exception
+
+inner catch
+inner catch
+outer catch

tests/exceptions/.expect/terminate.txt

@@ -24 +24 @@
 caught second exception
 recaught first exception
+
+inner catch
+outer catch

tests/exceptions/interact.cfa

@@ -86 +86 @@
                 printf("outer terminate catch (error)\n");
         }
-#if 0
         printf("\n");
 
@@ -111 +110 @@
                 printf("outermost catch (error)\n");
         }
-#endif
 }

tests/exceptions/resume.cfa

@@ -99 +99 @@
                 printf("caught second exception (bad location)\n");
         }
+        printf("\n");
+
+        // Check successive operations.
+        try {
+                try {
+                        THROW_RESUME(&(zen){});
+                        THROW_RESUME(&(zen){});
+                } catchResume (zen *) {
+                        printf("inner catch\n");
+                }
+                THROW_RESUME(&(zen){});
+        } catchResume (zen *) {
+                printf("outer catch\n");
+        }
 }

tests/exceptions/terminate.cfa

@@ -99 +99 @@
                 printf("caught second exception (bad location)\n");
         }
+        printf("\n");
+
+        // Check successive operations.
+        try {
+                try {
+                        THROW(&(zen){});
+                        THROW(&(zen){});
+                } catch (zen *) {
+                        printf("inner catch\n");
+                }
+                THROW(&(zen){});
+        } catch (zen *) {
+                printf("outer catch\n");
+        }
 }