Changes in src/ControlStruct/MultiLevelExit.cpp [553f032f:4a40fca7]

File:

• src/ControlStruct/MultiLevelExit.cpp (modified) (10 diffs)

src/ControlStruct/MultiLevelExit.cpp

@@ -10 +10 @@
 // Created On       : Mon Nov  1 13:48:00 2021
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Sep  8 17:04:00 2023
-// Update Count     : 36
+// Last Modified On : Wed Sep  6 12:00:00 2023
+// Update Count     : 35
 //
 
@@ -27 +27 @@
 
 namespace {
-
-/// The return context is used to remember if returns are allowed and if
-/// not, why not. It is the nearest local control flow blocking construct.
-enum ReturnContext {
-        MayReturn,
-        InTryWithHandler,
-        InResumeHandler,
-        InTerminateHandler,
-        InFinally,
-};
 
 class Entry {
@@ -136 +126 @@
         void previsit( const TryStmt * );
         void postvisit( const TryStmt * );
-        void previsit( const CatchClause * );
         void previsit( const FinallyClause * );
 
@@ -145 +134 @@
         vector<Entry> enclosing_control_structures;
         Label break_label;
-        ReturnContext ret_context;
+        bool inFinally;
 
         template<typename LoopNode>
@@ -155 +144 @@
                 const list<ptr<Stmt>> & kids, bool caseClause );
 
-        void enterSealedContext( ReturnContext );
-
         template<typename UnaryPredicate>
         auto findEnclosingControlStructure( UnaryPredicate pred ) {
@@ -170 +157 @@
 MultiLevelExitCore::MultiLevelExitCore( const LabelToStmt & lt ) :
         target_table( lt ), break_label( CodeLocation(), "" ),
-        ret_context( ReturnContext::MayReturn )
+        inFinally( false )
 {}
 
@@ -501 +488 @@
 
 void MultiLevelExitCore::previsit( const ReturnStmt * stmt ) {
-        char const * context;
-        switch ( ret_context ) {
-        case ReturnContext::MayReturn:
-                return;
-        case ReturnContext::InTryWithHandler:
-                context = "try statement with a catch clause";
-                break;
-        case ReturnContext::InResumeHandler:
-                context = "catchResume clause";
-                break;
-        case ReturnContext::InTerminateHandler:
-                context = "catch clause";
-                break;
-        case ReturnContext::InFinally:
-                context = "finally clause";
-                break;
-        default:
-                assert(0);
-        }
-        SemanticError( stmt->location, toString( "'return' may not appear in a ", context ) );
+        if ( inFinally ) {
+                SemanticError( stmt->location, "'return' may not appear in a finally clause" );
+        }
 }
 
@@ -530 +500 @@
                 GuardAction([this](){ enclosing_control_structures.pop_back(); } );
         }
-
-        // Try statements/try blocks are only sealed with a termination handler.
-        for ( auto clause : stmt->handlers ) {
-                if ( ast::Terminate == clause->kind ) {
-                        return enterSealedContext( ReturnContext::InTryWithHandler );
-                }
-        }
 }
 
@@ -549 +512 @@
 }
 
-void MultiLevelExitCore::previsit( const CatchClause * clause ) {
-        ReturnContext context = ( ast::Terminate == clause->kind )
-                ? ReturnContext::InTerminateHandler : ReturnContext::InResumeHandler;
-        enterSealedContext( context );
-}
-
 void MultiLevelExitCore::previsit( const FinallyClause * ) {
-        enterSealedContext( ReturnContext::InFinally );
+        GuardAction([this, old = std::move( enclosing_control_structures)](){ enclosing_control_structures = std::move(old); });
+        enclosing_control_structures = vector<Entry>();
+        GuardValue( inFinally ) = true;
 }
 
@@ -658 +617 @@
 }
 
-void MultiLevelExitCore::enterSealedContext( ReturnContext enter_context ) {
-        GuardAction([this, old = std::move(enclosing_control_structures)](){ enclosing_control_structures = std::move(old); });
-        enclosing_control_structures = vector<Entry>();
-        GuardValue( ret_context ) = enter_context;
-}
-
 } // namespace