Changeset 6d43cdde

Timestamp:

Apr 2, 2020, 11:35:13 AM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

3eb5a478

Parents:

cfbc703d

Message:

Rework of exception tests. Includes a new disabled failing test case.

Location:

tests/exceptions

Files:

• .expect/conditional.txt (added)
• .expect/except-0.txt (deleted)
• .expect/except-1.txt (deleted)
• .expect/except-2.txt (deleted)
• .expect/except-3.txt (deleted)
• .expect/finally.txt (added)
• .expect/interact.txt (added)
• .expect/resume.txt (added)
• .expect/terminate.txt (added)
• conditional.cfa (added)
• except-0.cfa (deleted)
• except-1.cfa (deleted)
• except-2.cfa (deleted)
• except-3.cfa (deleted)
• except-io.hfa (added)
• except-mac.hfa (modified) (5 diffs)
• finally.cfa (added)
• interact.cfa (added)
• resume.cfa (added)
• terminate.cfa (added)

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:
+// The fully qualified name of the base exception type:
 #define BASE_EXCEPT __cfaehm_base_exception_t
 
@@ -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,)