Changeset 38ac6ec


Ignore:
Timestamp:
Jul 11, 2017, 4:39:34 PM (4 years ago)
Author:
Andrew Beach <ajbeach@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
20519b7
Parents:
fcab269
Message:

Fixed some names that had drifted from terminate/resume.

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/ControlStruct/ExceptTranslate.cc

    rfcab269 r38ac6ec  
    1010// Created On       : Wed Jun 14 16:49:00 2017
    1111// Last Modified By : Andrew Beach
    12 // Last Modified On : Fri Jun 30 13:30:00 2017
    13 // Update Count     : 1
     12// Last Modified On : Tus Jul 11 16:33:00 2017
     13// Update Count     : 2
    1414//
    1515
     
    157157        Statement * create_terminate_throw( ThrowStmt *throwStmt ) {
    158158                // { int NAME = EXPR; __throw_terminate( &NAME ); }
    159                 return create_given_throw( "__cfaehm__throw_termination", throwStmt );
     159                return create_given_throw( "__cfaehm__throw_terminate", throwStmt );
    160160        }
    161161        Statement * create_terminate_rethrow( ThrowStmt *throwStmt ) {
     
    164164                Statement * result = new ExprStmt(
    165165                        throwStmt->get_labels(),
    166                         new UntypedExpr( new NameExpr( "__cfaehm__rethrow_termination" ) )
     166                        new UntypedExpr( new NameExpr( "__cfaehm__rethrow_terminate" ) )
    167167                        );
    168168                delete throwStmt;
     
    171171        Statement * create_resume_throw( ThrowStmt *throwStmt ) {
    172172                // __throw_resume( EXPR );
    173                 return create_given_throw( "__cfaehm__throw_resumption", throwStmt );
     173                return create_given_throw( "__cfaehm__throw_resume", throwStmt );
    174174        }
    175175        Statement * create_resume_rethrow( ThrowStmt *throwStmt ) {
  • src/libcfa/exception.c

    rfcab269 r38ac6ec  
    1010// Created On       : Mon Jun 26 15:13:00 2017
    1111// Last Modified By : Andrew Beach
    12 // Last Modified On : Mon Nov 26 15:11:00 2017
    13 // Update Count     : 0
     12// Last Modified On : Tus Jul 11 16:36:00 2017
     13// Update Count     : 1
    1414//
    1515
     
    4444// RESUMPTION ================================================================
    4545
    46 void __cfaehm__throw_resumption(exception * except) {
     46void __cfaehm__throw_resume(exception * except) {
    4747
    4848        // DEBUG
     
    6565
    6666        // Fall back to termination:
    67         __cfaehm__throw_termination(except);
     67        __cfaehm__throw_terminate(except);
    6868        // TODO: Default handler for resumption.
    6969}
     
    111111}
    112112
    113 void __cfaehm__throw_termination( exception * val ) {
     113void __cfaehm__throw_terminate( exception * val ) {
    114114        // Store the current exception
    115115        shared_stack.current_exception = *val;
     
    147147
    148148// Nesting this the other way would probably be faster.
    149 void __cfaehm__rethrow_termination(void) {
     149void __cfaehm__rethrow_terminate(void) {
    150150        // DEBUG
    151151        printf("Rethrowing termination exception\n");
    152152
    153         __cfaehm__throw_termination(&shared_stack.current_exception);
     153        __cfaehm__throw_terminate(&shared_stack.current_exception);
    154154}
    155155
  • src/libcfa/exception.h

    rfcab269 r38ac6ec  
    1010// Created On       : Mon Jun 26 15:11:00 2017
    1111// Last Modified By : Andrew Beach
    12 // Last Modified On : Tus Jul 11 13:40:00 2017
    13 // Update Count     : 1
     12// Last Modified On : Tus Jul 11 16:31:00 2017
     13// Update Count     : 2
    1414//
    1515
     
    2626
    2727// Used in throw statement translation.
    28 void __cfaehm__throw_termination(exception * except) __attribute__((noreturn));
    29 void __cfaehm__rethrow_termination() __attribute__((noreturn));
    30 void __cfaehm__throw_resumption(exception * except);
     28void __cfaehm__throw_terminate(exception * except) __attribute__((noreturn));
     29void __cfaehm__rethrow_terminate() __attribute__((noreturn));
     30void __cfaehm__throw_resume(exception * except);
    3131
    3232// Function catches termination exceptions.
Note: See TracChangeset for help on using the changeset viewer.