Changeset c529a24 for doc/working/exception/impl/test-main.c

Timestamp:

Jun 16, 2017, 4:36:00 PM (7 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:

365d553c

Parents:

0892b1b

Message:

Updates to exception handling and translation.

File:

• doc/working/exception/impl/test-main.c (modified) (10 diffs)

doc/working/exception/impl/test-main.c

@@ -6 +6 @@
 #include <stdbool.h>
 
-// Translation Helpers:
-#define CLEANUP(function) \
-        struct __cleanup_hook __hidden_hook __attribute__((cleanup(function)))
-
-#define SET_UP_RESUME_NODE(handler_function) \
-        struct __try_resume_node node \
-                __attribute__((cleanup(__try_resume_node_delete))); \
-        __try_resume_node_new(&node, handler_function)
-
+// Helps with manual translation. It may or may not get folded into the
+// header, that depends on how it interacts with concurancy.
 void __try_resume_node_new(struct __try_resume_node * node,
         _Bool (*handler)(exception except)) {
@@ -20 +13 @@
     shared_stack.top_resume = node;
     node->try_to_handle = handler;
-}
-
-void __try_resume_node_delete(struct __try_resume_node * node) {
-    shared_stack.top_resume = node->next;
 }
 
@@ -122 +111 @@
                 }
                 struct __try_resume_node node
-                        __attribute__((cleanup(__try_resume_node_delete)));
+                        __attribute__((cleanup(__try_resume_cleanup)));
                 __try_resume_node_new(&node, beta_handle1);
                 {
@@ -144 +133 @@
                 }
                 struct __try_resume_node node
-                        __attribute__((cleanup(__try_resume_node_delete)));
+                        __attribute__((cleanup(__try_resume_cleanup)));
                 __try_resume_node_new(&node, alpha_handle1);
                 {
@@ -260 +249 @@
                 }
                 struct __try_resume_node node
-                        __attribute__((cleanup(__try_resume_node_delete)));
+                        __attribute__((cleanup(__try_resume_cleanup)));
                 __try_resume_node_new(&node, fn_handle1);
                 {
@@ -279 +268 @@
                 }
                 struct __try_resume_node node
-                        __attribute__((cleanup(__try_resume_node_delete)));
+                        __attribute__((cleanup(__try_resume_cleanup)));
                 __try_resume_node_new(&node, fn_handle1);
                 {
@@ -349 +338 @@
                 }
                 struct __try_resume_node node
-                        __attribute__((cleanup(__try_resume_node_delete)));
+                        __attribute__((cleanup(__try_resume_cleanup)));
                 __try_resume_node_new(&node, reresume_handle1);
                 {
@@ -361 +350 @@
                         }
                         struct __try_resume_node node
-                                __attribute__((cleanup(__try_resume_node_delete)));
+                                __attribute__((cleanup(__try_resume_cleanup)));
                         __try_resume_node_new(&node, reresume_handle2);
                         {
@@ -409 +398 @@
                 }
                 struct __try_resume_node node
-                        __attribute__((cleanup(__try_resume_node_delete)));
+                        __attribute__((cleanup(__try_resume_cleanup)));
                 __try_resume_node_new(&node, foe_handle1);
                 {
@@ -456 +445 @@
                 }
                 struct __try_resume_node node
-                        __attribute__((cleanup(__try_resume_node_delete)));
+                        __attribute__((cleanup(__try_resume_cleanup)));
                 __try_resume_node_new(&node, fee_handle1);
                 {