Changeset 42b0d73 for doc/working/exception/translate.c

Timestamp:

Jun 16, 2017, 9:07:33 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

436c0de, e1c1829, ec35498

Parents:

4aa2fb2 (diff), e1055441 (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:software/cfa/cfa-cc

File:

• doc/working/exception/translate.c (modified) (7 diffs)

doc/working/exception/translate.c

@@ -17 +17 @@
 
 void __throw_terminate(exception except) __attribute__((noreturn));
+void __rethrow_terminate() __attribute__((noreturn));
 void __throw_resume(exception except);
 
@@ -27 +28 @@
         bool (*try_to_handle)(exception except);
 };
+
+void __try_resume_cleanup(struct __try_resume_node * node);
 
 struct __cleanup_hook {};
@@ -147 +150 @@
 void try_resume() {
         {
-                bool catch1(exception except) {
+                bool handle1(exception except) {
                         OtherException inner_except;
                         if (dynamic_cast__SomeException(except)) {
@@ -161 +164 @@
                 }
                 struct __try_resume_node data =
-                        {.next = stack.except.top_resume, .try_to_handle = catch1};
+                        {.next = stack.except.top_resume, .try_to_handle = handle1};
                 stack.except.top_resume = &data;
 
@@ -204 +207 @@
 
 
-// Combining the Above:
+// Resume + Finally:
+"Cforall"
+
+void try_resume_finally() {
+        try {
+                insideTry();
+        }
+        catch resume (SomeException) {
+                fiddleThing();
+        }
+        finally {
+                twiddleWidget();
+        }
+}
+
+"C"
+
+void try_resume_finally() {
+        {
+                void finally1() {
+                        twiddleWidget();
+                }
+                bool handle1(exception except) {
+                        if (dynamic_cast__SomeException(except)) {
+                                fiddleThing();
+                                return true;
+                        } else {
+                                return false;
+                        }
+                }
+                struct __cleanup_hook generated_name
+                        __attribute__((cleanup(finally1)));
+
+                struct __try_resume_node data =
+                        {.next = stack.except.top_resume, .try_to_handle = handle1};
+                stack.except.top_resume = &data;
+
+                struct __cleanup_hook generated_name
+                        __attribute__((cleanup(__try_resume_cleanup)));
+        }
+}
+
+
+// Terminate + Resume + Finally:
 "Cforall"
 
@@ -226 +272 @@
 void try_all() {
         {
+                bool handle1() {
+                        if (dynamic_cast__OtherException(except)) {
+                                twiddleWidget();
+                                return true;
+                        }
+                        return false;
+                }
                 void try1 () {
+                        struct __try_resume_node generated_name =
+                                {.next = stack.except.top_resume, .try_to_handle = handle1}
+                                __attribute__((cleanup(__try_resume_cleanup)));
+                        stack.except.top_resume = &data;
+
                         insideTry();
                 }
@@ -244 +302 @@
                         return 0;
                 }
-                bool catch2() {
-                        if (dynamic_cast__OtherException(except)) {
-                                twiddleWidget();
-                                return true;
-                        }
-                        return false;
-                }
                 void finally1() {
-                        // Finally, because of timing, also works for resume.
-                        // However this might not actually be better in any way.
-                        __try_resume_cleanup();
 
                         twiddleWidget();
                 }
-
-                struct __try_resume_node generated_name =
-                        {.next = stack.except.top_resume, .try_to_handle = catch2};
-                stack.except.top_resume = &data;
                 struct __cleanup_hook generated_name
                         __attribute__((cleanup(finally1)));