Changeset e9145a3 for src/tests/except-2.c

Timestamp:

Aug 17, 2017, 4:13:42 PM (8 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:

8f6dfe7

Parents:

21f0aa8

Message:

Updated exception tests to exception structures. Should be re-orginized still.

File:

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

src/tests/except-2.c

@@ -2 +2 @@
 
 
-#include <string.h>
+#include <stdlib>
+#include "except-mac.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)
@@ -50 +18 @@
 };
 extern num_error_vtable INSTANCE(num_error);
+
 struct num_error {
         struct num_error_vtable const * virtual_table;
@@ -55 +24 @@
         int num;
 };
+
 void num_error_msg(num_error * this) {
         if ( ! this->msg ) {
-                const char * base = "Num Error with code: X";
-                this->msg = strdup( base );
+                static const char * base = "Num Error with code: X";
+                this->msg = malloc(22);
+                for (int i = 0 ; (this->msg[i] = base[i]) ; ++i);
         }
         this->msg[21] = '0' + this->num;
@@ -90 +61 @@
         try {
                 yin black;
-                throw (BASE_EXCEPT *)&black;
+                THROW(&black);
         } catch ( yin * error ) {
                 printf("throw yin caught.\n");
@@ -97 +68 @@
         try {
                 yang white;
-                throwResume (BASE_EXCEPT *)&white;
+                THROW_RESUME(&white);
                 printf("> throwResume returned.\n");
         } catchResume ( yang * error ) {
@@ -105 +76 @@
         try {
                 num_error x = { 2 };
-                throw (BASE_EXCEPT *)&x;
+                THROW(&x);
         }
         catch (num_error * error ; 3 == error->virtual_table->code( error ) ) {