Changes in src/tests/except-2.c [e9145a3:fcc88a4]

File:

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

src/tests/except-2.c

@@ -2 +2 @@
 
 
-#include <stdlib>
-#include "except-mac.h"
+#include <string.h>
 
+// Local Exception Types and manual vtable types.
+#define GLUE2(left, right) left##right
+#define GLUE3(left, middle, right) left##middle##right
+#define BASE_EXCEPT __cfaehm__base_exception_t
+#define TABLE(name) GLUE2(name,_vtable)
+#define INSTANCE(name) GLUE3(_,name,_vtable_instance)
+#define TRIVIAL_EXCEPTION(name) \
+struct name; \
+struct TABLE(name) { \
+        struct TABLE(BASE_EXCEPT) const * parent; \
+        size_t size; \
+        void (*copy)(name *this, name * other); \
+        void (*free)(name *this); \
+        const char * (*msg)(name *this); \
+}; \
+extern TABLE(name) INSTANCE(name); \
+struct name { \
+        struct TABLE(name) const * virtual_table; \
+}; \
+const char * name##_msg(name * this) { \
+        return #name; \
+} \
+void name##_copy(name * this, name * other) { \
+        this->virtual_table = other->virtual_table; \
+} \
+TABLE(name) INSTANCE(name) @= { \
+        .parent : &INSTANCE(BASE_EXCEPT), \
+        .size : sizeof(name), .copy : name##_copy, \
+        .free : ^?{}, .msg : name##_msg \
+}; \
+void ?{}(name * this) { \
+        this->virtual_table = &INSTANCE(name); \
+}
 TRIVIAL_EXCEPTION(yin)
 TRIVIAL_EXCEPTION(yang)
@@ -18 +50 @@
 };
 extern num_error_vtable INSTANCE(num_error);
-
 struct num_error {
         struct num_error_vtable const * virtual_table;
@@ -24 +55 @@
         int num;
 };
-
 void num_error_msg(num_error * this) {
         if ( ! this->msg ) {
-                static const char * base = "Num Error with code: X";
-                this->msg = malloc(22);
-                for (int i = 0 ; (this->msg[i] = base[i]) ; ++i);
+                const char * base = "Num Error with code: X";
+                this->msg = strdup( base );
         }
         this->msg[21] = '0' + this->num;
@@ -61 +90 @@
         try {
                 yin black;
-                THROW(&black);
+                throw (BASE_EXCEPT *)&black;
         } catch ( yin * error ) {
                 printf("throw yin caught.\n");
@@ -68 +97 @@
         try {
                 yang white;
-                THROW_RESUME(&white);
+                throwResume (BASE_EXCEPT *)&white;
                 printf("> throwResume returned.\n");
         } catchResume ( yang * error ) {
@@ -76 +105 @@
         try {
                 num_error x = { 2 };
-                THROW(&x);
+                throw (BASE_EXCEPT *)&x;
         }
         catch (num_error * error ; 3 == error->virtual_table->code( error ) ) {