Changes in libcfa/src/exception.h [c960331:69c5c00]

File:

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

libcfa/src/exception.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// exception.h -- Internal exception handling definitions.
+// exception.h -- Builtins for exception handling.
 //
 // Author           : Andrew Beach
 // Created On       : Mon Jun 26 15:11:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Oct 27 14:45:00 2020
-// Update Count     : 11
+// Last Modified On : Tue May 19 14:17:00 2020
+// Update Count     : 10
 //
 
 #pragma once
 
-// This could be considered several headers. All are internal to the exception
-// system but needed to depending on whether they are C/Cforall code and
-// whether or not they are part of the builtins.
 
 #ifdef __cforall
 extern "C" {
 #endif
-
-// Included in C code or the built-ins.
-#if !defined(__cforall) || defined(__cforall_builtins__)
 
 struct __cfaehm_base_exception_t;
@@ -53 +47 @@
 // Function catches termination exceptions.
 void __cfaehm_try_terminate(
-        void (*try_block)(),
-        void (*catch_block)(int index, exception_t * except),
-        int (*match_block)(exception_t * except));
+    void (*try_block)(),
+    void (*catch_block)(int index, exception_t * except),
+    int (*match_block)(exception_t * except));
 
 // Clean-up the exception in catch blocks.
@@ -62 +56 @@
 // Data structure creates a list of resume handlers.
 struct __cfaehm_try_resume_node {
-        struct __cfaehm_try_resume_node * next;
-        _Bool (*handler)(exception_t * except);
+    struct __cfaehm_try_resume_node * next;
+    _Bool (*handler)(exception_t * except);
 };
 
 // These act as constructor and destructor for the resume node.
 void __cfaehm_try_resume_setup(
-        struct __cfaehm_try_resume_node * node,
-        _Bool (*handler)(exception_t * except));
+    struct __cfaehm_try_resume_node * node,
+    _Bool (*handler)(exception_t * except));
 void __cfaehm_try_resume_cleanup(
-        struct __cfaehm_try_resume_node * node);
+    struct __cfaehm_try_resume_node * node);
 
 // Check for a standard way to call fake deconstructors.
 struct __cfaehm_cleanup_hook {};
 
-#endif
-
-// Included in C code and the library.
-#if !defined(__cforall) || !defined(__cforall_builtins__)
-struct __cfaehm_node {
-        struct _Unwind_Exception unwind_exception;
-        struct __cfaehm_node * next;
-        int handler_index;
-};
-
-static inline exception_t * __cfaehm_cancellation_exception(
-                struct _Unwind_Exception * unwind_exception ) {
-        return (exception_t *)(1 + (struct __cfaehm_node *)unwind_exception);
-}
-#endif
-
 #ifdef __cforall
 }
-
-// Built-ins not visible in C.
-#if defined(__cforall_builtins__)
 
 // Not all the built-ins can be expressed in C. These can't be
@@ -149 +124 @@
 
 #endif
-
-#endif