Changes in tests/exceptions/defaults.cfa [ecfd758:fd54fef]

File:

• tests/exceptions/defaults.cfa (modified) (5 diffs)

tests/exceptions/defaults.cfa

@@ -4 +4 @@
 #include <exception.hfa>
 
-EHM_EXCEPTION(log_message)(
+DATA_EXCEPTION(log_message)(
         char * msg;
 );
 
-_EHM_DEFINE_COPY(log_message, )
-const char * msg(log_message * this) {
+void ?{}(log_message & this, char * msg) {
+        VTABLE_INIT(this, log_message);
+        this.msg = msg;
+}
+
+const char * get_log_message(log_message * this) {
         return this->msg;
 }
-_EHM_VIRTUAL_TABLE(log_message, , log_vt);
+
+VTABLE_INSTANCE(log_message)(get_log_message);
 
 // Logging messages don't have to be handled.
@@ -23 +28 @@
         // We can catch log:
         try {
-                throwResume (log_message){&log_vt, "Should be printed.\n"};
+                throwResume (log_message){"Should be printed.\n"};
         } catchResume (log_message * this) {
                 printf("%s", this->virtual_table->msg(this));
         }
         // But we don't have to:
-        throwResume (log_message){&log_vt, "Should not be printed.\n"};
+        throwResume (log_message){"Should not be printed.\n"};
 }
 
 // I don't have a good use case for doing the same with termination.
-EHM_EXCEPTION(jump)();
+TRIVIAL_EXCEPTION(jump);
 void defaultTerminationHandler(jump &) {
         printf("jump default handler.\n");
 }
 
-EHM_VIRTUAL_TABLE(jump, jump_vt);
-
 void jump_test(void) {
         try {
-                throw (jump){&jump_vt};
+                throw (jump){};
         } catch (jump * this) {
                 printf("jump catch handler.\n");
         }
-        throw (jump){&jump_vt};
+        throw (jump){};
 }
 
-EHM_EXCEPTION(first)();
-EHM_VIRTUAL_TABLE(first, first_vt);
-
-EHM_EXCEPTION(unhandled_exception)();
-EHM_VIRTUAL_TABLE(unhandled_exception, unhandled_vt);
+TRIVIAL_EXCEPTION(first);
+TRIVIAL_EXCEPTION(unhandled_exception);
 
 void unhandled_test(void) {
         forall(T &, V & | is_exception(T, V))
         void defaultTerminationHandler(T &) {
-                throw (unhandled_exception){&unhandled_vt};
+                throw (unhandled_exception){};
         }
         void defaultTerminationHandler(unhandled_exception &) {
@@ -63 +63 @@
         }
         try {
-                throw (first){&first_vt};
+                throw (first){};
         } catch (unhandled_exception * t) {
                 printf("Catch unhandled_exception.\n");
@@ -69 +69 @@
 }
 
-EHM_EXCEPTION(second)();
-EHM_VIRTUAL_TABLE(second, second_vt);
+TRIVIAL_EXCEPTION(second);
 
 void cross_test(void) {
         void defaultTerminationHandler(first &) {
                 printf("cross terminate default\n");
-                throw (second){&second_vt};
+                throw (second){};
         }
         void defaultResumptionHandler(first &) {
                 printf("cross resume default\n");
-                throwResume (second){&second_vt};
+                throwResume (second){};
         }
         try {
                 printf("cross terminate throw\n");
-                throw (first){&first_vt};
+                throw (first){};
         } catch (second *) {
                 printf("cross terminate catch\n");
@@ -89 +88 @@
         try {
                 printf("cross resume throw\n");
-                throwResume (first){&first_vt};
+                throwResume (first){};
         } catchResume (second *) {
                 printf("cross resume catch\n");