Changeset fcc88a4

Timestamp:

Aug 15, 2017, 3:40:39 PM (7 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

936e9f4

Parents:

3f27b9a

Message:

That got the last case in except-2 working.

Location:

src/tests

Files:

• except-0.c (modified) (1 diff)
• except-1.c (modified) (1 diff)
• except-2.c (modified) (3 diffs)

src/tests/except-0.c

@@ -1 +1 @@
 // Draft of tests for exception handling.
+// Outdated: The integer constant exceptions need to be replaced with virtual
+// exceptions for the new system.
 
 // ERROR: exceptions do not interact with ^?{} properly.

src/tests/except-1.c

@@ -1 +1 @@
 // Draft memory management test. (remember -fexceptions)
+// Outdated: The integer constant exceptions need to be replaced with virtual
+// exceptions for the new system.
 
 #include <stdio.h>

src/tests/except-2.c

@@ -80 +80 @@
 }
 num_error_vtable _num_error_vtable_instance @= {
-        &___cfaehm__base_exception_t_vtable_instance,
+        &INSTANCE(BASE_EXCEPT),
         sizeof(num_error), ?{}, ^?{},
         num_error_msg, num_error_code
@@ -91 +91 @@
                 yin black;
                 throw (BASE_EXCEPT *)&black;
-        } catch( yin * error ) {
+        } catch ( yin * error ) {
                 printf("throw yin caught.\n");
         }
@@ -99 +99 @@
                 throwResume (BASE_EXCEPT *)&white;
                 printf("> throwResume returned.\n");
-        } catchResume( yang * error ) {
+        } catchResume ( yang * error ) {
                 printf("throwResume yang caught <");
         }
 
-        /* Conditional catches are still a work in progress.
         try {
                 num_error x = { 2 };
-                throw (struct exception_t *)&x;
+                throw (BASE_EXCEPT *)&x;
         }
-        catch (num_error * error0 ; 3 == error0->virtual_table->code( error0 ) ) {
-                printf("exception at %p\n", error0 );
+        catch (num_error * error ; 3 == error->virtual_table->code( error ) ) {
+                printf("exception at %p\n", error );
                 printf("Should not be printed.\n");
         }
-        catch (num_error * error1 ; 2 == error1->virtual_table->code( error1 ) ) {
+        catch (num_error * error ; 2 == error->virtual_table->code( error ) ) {
                 printf("Should be printed.\n");
-        }*/
+        }
 }