Changeset 7030dab for tests/exceptions/except-mac.hfa

Timestamp:

Apr 6, 2020, 4:46:28 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

e3bc51c

Parents:

71d6bd8 (diff), 057298e (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' into new-ast

File:

• tests/exceptions/except-mac.hfa (moved) (moved from tests/except-mac.hfa ) (5 diffs)

tests/exceptions/except-mac.hfa

@@ -6 +6 @@
 #define GLUE3(left, middle, right) left##middle##right
 
-// The fully (perhaps overly) qualified name of the base exception type:
-#define BASE_EXCEPT __cfaabi_ehm__base_exception_t
+// The fully qualified name of the base exception type:
+#define BASE_EXCEPT __cfaehm_base_exception_t
 
 // Get the name of the vtable type and vtable instance for an exception type:
@@ -34 +34 @@
         __VA_ARGS__ \
 }; \
-extern TABLE(except_name) INSTANCE(except_name);
+extern TABLE(except_name) INSTANCE(except_name)
 
 // The first field of the exception structure should be created with this.
@@ -50 +50 @@
         &INSTANCE(parent_name), sizeof(except_name), \
         copy, free, msg, ## __VA_ARGS__ \
-};
+}
 
 // Same, but used declarators for arguments.
@@ -57 +57 @@
         .parent : &INSTANCE(parent_name), .size : sizeof(except_name), \
         .copy : copy, .free : free, .msg : msg, ## __VA_ARGS__ \
-};
+}
 
 
 
 // Declare a trivial exception, one that adds no features:
-#define TRIVIAL_EXCEPTION(name) \
-DECLARE_EXCEPT(name,BASE_EXCEPT,) \
+#define _TRIVIAL_EXCEPTION(name, parent_name, ...) \
+DECLARE_EXCEPT(name,parent_name,); \
 struct name { \
         VTABLE_FIELD(name); \
@@ -76 +76 @@
         VTABLE_INIT(this,name); \
 } \
-VTABLE_INSTANCE(name,BASE_EXCEPT,GLUE2(name,_copy),^?{},GLUE2(name,_msg),)
+VTABLE_INSTANCE(name,parent_name,GLUE2(name,_copy),^?{},GLUE2(name,_msg),)
+
+// TRIVIAL_EXCEPTION(name_of_exception, [parent_exception])
+#define TRIVIAL_EXCEPTION(...) _TRIVIAL_EXCEPTION(__VA_ARGS__,BASE_EXCEPT,)