Changeset 38ac6ec for src

Timestamp:

Jul 11, 2017, 4:39:34 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:

20519b7

Parents:

fcab269

Message:

Fixed some names that had drifted from terminate/resume.

Location:

src

Files:

• ControlStruct/ExceptTranslate.cc (modified) (4 diffs)
• libcfa/exception.c (modified) (5 diffs)
• libcfa/exception.h (modified) (2 diffs)

src/ControlStruct/ExceptTranslate.cc

@@ -10 +10 @@
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jun 30 13:30:00 2017
-// Update Count     : 1
+// Last Modified On : Tus Jul 11 16:33:00 2017
+// Update Count     : 2
 //
 
@@ -157 +157 @@
         Statement * create_terminate_throw( ThrowStmt *throwStmt ) {
                 // { int NAME = EXPR; __throw_terminate( &NAME ); }
-                return create_given_throw( "__cfaehm__throw_termination", throwStmt );
+                return create_given_throw( "__cfaehm__throw_terminate", throwStmt );
         }
         Statement * create_terminate_rethrow( ThrowStmt *throwStmt ) {
@@ -164 +164 @@
                 Statement * result = new ExprStmt(
                         throwStmt->get_labels(),
-                        new UntypedExpr( new NameExpr( "__cfaehm__rethrow_termination" ) )
+                        new UntypedExpr( new NameExpr( "__cfaehm__rethrow_terminate" ) )
                         );
                 delete throwStmt;
@@ -171 +171 @@
         Statement * create_resume_throw( ThrowStmt *throwStmt ) {
                 // __throw_resume( EXPR );
-                return create_given_throw( "__cfaehm__throw_resumption", throwStmt );
+                return create_given_throw( "__cfaehm__throw_resume", throwStmt );
         }
         Statement * create_resume_rethrow( ThrowStmt *throwStmt ) {

src/libcfa/exception.c

@@ -10 +10 @@
 // Created On       : Mon Jun 26 15:13:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Nov 26 15:11:00 2017
-// Update Count     : 0
+// Last Modified On : Tus Jul 11 16:36:00 2017
+// Update Count     : 1
 //
 
@@ -44 +44 @@
 // RESUMPTION ================================================================
 
-void __cfaehm__throw_resumption(exception * except) {
+void __cfaehm__throw_resume(exception * except) {
 
         // DEBUG
@@ -65 +65 @@
 
         // Fall back to termination:
-        __cfaehm__throw_termination(except);
+        __cfaehm__throw_terminate(except);
         // TODO: Default handler for resumption.
 }
@@ -111 +111 @@
 }
 
-void __cfaehm__throw_termination( exception * val ) {
+void __cfaehm__throw_terminate( exception * val ) {
         // Store the current exception
         shared_stack.current_exception = *val;
@@ -147 +147 @@
 
 // Nesting this the other way would probably be faster.
-void __cfaehm__rethrow_termination(void) {
+void __cfaehm__rethrow_terminate(void) {
         // DEBUG
         printf("Rethrowing termination exception\n");
 
-        __cfaehm__throw_termination(&shared_stack.current_exception);
+        __cfaehm__throw_terminate(&shared_stack.current_exception);
 }
 

src/libcfa/exception.h

@@ -10 +10 @@
 // Created On       : Mon Jun 26 15:11:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus Jul 11 13:40:00 2017
-// Update Count     : 1
+// Last Modified On : Tus Jul 11 16:31:00 2017
+// Update Count     : 2
 //
 
@@ -26 +26 @@
 
 // Used in throw statement translation.
-void __cfaehm__throw_termination(exception * except) __attribute__((noreturn));
-void __cfaehm__rethrow_termination() __attribute__((noreturn));
-void __cfaehm__throw_resumption(exception * except);
+void __cfaehm__throw_terminate(exception * except) __attribute__((noreturn));
+void __cfaehm__rethrow_terminate() __attribute__((noreturn));
+void __cfaehm__throw_resume(exception * except);
 
 // Function catches termination exceptions.