Changeset 6ac5223 for src/tests/except-2.c

Timestamp:

Aug 17, 2017, 3:42:21 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

e50e9ff

Parents:

97e3296 (diff), 21f0aa8 (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

File:

• src/tests/except-2.c (modified) (3 diffs)

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");
-        }*/
+        }
 }