Changeset 45c43e5 for src/libcfa/exception.h

Timestamp:

Feb 26, 2018, 12:49:55 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

eddb399

Parents:

17fc7a5 (diff), 2c39855 (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' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/libcfa/exception.h (modified) (5 diffs)

src/libcfa/exception.h

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Mon Jun 26 15:11:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 17 15:44:00 2017
-// Update Count     : 6
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Feb 22 18:11:15 2018
+// Update Count     : 8
 //
 
@@ -22 +22 @@
 
 struct __cfaabi_ehm__base_exception_t;
-typedef struct __cfaabi_ehm__base_exception_t exception;
+typedef struct __cfaabi_ehm__base_exception_t exception_t;
 struct __cfaabi_ehm__base_exception_t_vtable {
         const struct __cfaabi_ehm__base_exception_t_vtable * parent;
@@ -39 +39 @@
 
 // Used in throw statement translation.
-void __cfaabi_ehm__throw_terminate(exception * except) __attribute__((noreturn));
+void __cfaabi_ehm__throw_terminate(exception_t * except) __attribute__((noreturn));
 void __cfaabi_ehm__rethrow_terminate() __attribute__((noreturn));
-void __cfaabi_ehm__throw_resume(exception * except);
+void __cfaabi_ehm__throw_resume(exception_t * except);
 
 // Function catches termination exceptions.
 void __cfaabi_ehm__try_terminate(
     void (*try_block)(),
-    void (*catch_block)(int index, exception * except),
-    int (*match_block)(exception * except));
+    void (*catch_block)(int index, exception_t * except),
+    int (*match_block)(exception_t * except));
 
 // Clean-up the exception in catch blocks.
@@ -55 +55 @@
 struct __cfaabi_ehm__try_resume_node {
     struct __cfaabi_ehm__try_resume_node * next;
-    _Bool (*handler)(exception * except);
+    _Bool (*handler)(exception_t * except);
 };
 
@@ -61 +61 @@
 void __cfaabi_ehm__try_resume_setup(
     struct __cfaabi_ehm__try_resume_node * node,
-    _Bool (*handler)(exception * except));
+    _Bool (*handler)(exception_t * except));
 void __cfaabi_ehm__try_resume_cleanup(
     struct __cfaabi_ehm__try_resume_node * node);