Changes in src/ControlStruct/MultiLevelExit.cpp [400b8be:891f707]

File:

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

src/ControlStruct/MultiLevelExit.cpp

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Mon Nov  1 13:48:00 2021
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Mar 28  9:42:00 2022
-// Update Count     : 34
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Feb  2 23:07:54 2022
+// Update Count     : 33
 //
 
@@ -40 +40 @@
 
         enum Kind {
-                ForStmtK, WhileDoStmtK, CompoundStmtK, IfStmtK, CaseClauseK, SwitchStmtK, TryStmtK
+                ForStmtK, WhileDoStmtK, CompoundStmtK, IfStmtK, CaseStmtK, SwitchStmtK, TryStmtK
         } kind;
 
@@ -58 +58 @@
         Entry( const IfStmt *stmt, Label breakExit ) :
                 stmt( stmt ), firstTarget( breakExit ), secondTarget(), kind( IfStmtK ) {}
-        Entry( const CaseClause *, const CompoundStmt *stmt, Label fallExit ) :
-                stmt( stmt ), firstTarget( fallExit ), secondTarget(), kind( CaseClauseK ) {}
+        Entry( const CaseStmt *stmt, Label fallExit ) :
+                stmt( stmt ), firstTarget( fallExit ), secondTarget(), kind( CaseStmtK ) {}
         Entry( const SwitchStmt *stmt, Label breakExit, Label fallDefaultExit ) :
                 stmt( stmt ), firstTarget( breakExit ), secondTarget( fallDefaultExit ), kind( SwitchStmtK ) {}
@@ -66 +66 @@
 
         bool isContTarget() const { return kind <= WhileDoStmtK; }
-        bool isBreakTarget() const { return kind != CaseClauseK; }
-        bool isFallTarget() const { return kind == CaseClauseK; }
+        bool isBreakTarget() const { return kind != CaseStmtK; }
+        bool isFallTarget() const { return kind == CaseStmtK; }
         bool isFallDefaultTarget() const { return kind == SwitchStmtK; }
 
         // These routines set a target as being "used" by a BranchStmt
         Label useContExit() { assert( kind <= WhileDoStmtK ); return useTarget(secondTarget); }
-        Label useBreakExit() { assert( kind != CaseClauseK ); return useTarget(firstTarget); }
-        Label useFallExit() { assert( kind == CaseClauseK );  return useTarget(firstTarget); }
+        Label useBreakExit() { assert( kind != CaseStmtK ); return useTarget(firstTarget); }
+        Label useFallExit() { assert( kind == CaseStmtK );  return useTarget(firstTarget); }
         Label useFallDefaultExit() { assert( kind == SwitchStmtK ); return useTarget(secondTarget); }
 
         // These routines check if a specific label for a statement is used by a BranchStmt
         bool isContUsed() const { assert( kind <= WhileDoStmtK ); return secondTarget.used; }
-        bool isBreakUsed() const { assert( kind != CaseClauseK ); return firstTarget.used; }
-        bool isFallUsed() const { assert( kind == CaseClauseK ); return firstTarget.used; }
+        bool isBreakUsed() const { assert( kind != CaseStmtK ); return firstTarget.used; }
+        bool isFallUsed() const { assert( kind == CaseStmtK ); return firstTarget.used; }
         bool isFallDefaultUsed() const { assert( kind == SwitchStmtK ); return secondTarget.used; }
         void seenDefault() { fallDefaultValid = false; }
@@ -115 +115 @@
         void previsit( const ForStmt * );
         const ForStmt * postvisit( const ForStmt * );
-        const CaseClause * previsit( const CaseClause * );
+        const CaseStmt * previsit( const CaseStmt * );
         void previsit( const IfStmt * );
         const IfStmt * postvisit( const IfStmt * );
@@ -123 +123 @@
         void previsit( const TryStmt * );
         void postvisit( const TryStmt * );
-        void previsit( const FinallyClause * );
+        void previsit( const FinallyStmt * );
 
         const Stmt * mutateLoop( const Stmt * body, Entry& );
@@ -288 +288 @@
                   auto switchStmt = strict_dynamic_cast< const SwitchStmt * >( targetEntry->stmt );
                   bool foundDefault = false;
-                  for ( auto caseStmt : switchStmt->cases ) {
+                  for ( auto subStmt : switchStmt->stmts ) {
+                          const CaseStmt * caseStmt = subStmt.strict_as<CaseStmt>();
                           if ( caseStmt->isDefault() ) {
                                   foundDefault = true;
@@ -364 +365 @@
 }
 
-const CaseClause * MultiLevelExitCore::previsit( const CaseClause * stmt ) {
+const CaseStmt * MultiLevelExitCore::previsit( const CaseStmt * stmt ) {
         visit_children = false;
 
@@ -374 +375 @@
 
         // The cond may not exist, but if it does update it now.
-        visitor->maybe_accept( stmt, &CaseClause::cond );
+        visitor->maybe_accept( stmt, &CaseStmt::cond );
 
         // Just save the mutated node for simplicity.
-        CaseClause * mutStmt = mutate( stmt );
-
-        Label fallLabel = newLabel( "fallThrough", stmt->location );
+        CaseStmt * mutStmt = mutate( stmt );
+
+        Label fallLabel = newLabel( "fallThrough", stmt );
         if ( ! mutStmt->stmts.empty() ) {
-                // These should already be in a block.
-                auto first = mutStmt->stmts.front().get_and_mutate();
-                auto block = strict_dynamic_cast<CompoundStmt *>( first );
-
                 // Ensure that the stack isn't corrupted by exceptions in fixBlock.
                 auto guard = makeFuncGuard(
-                        [&](){ enclosing_control_structures.emplace_back( mutStmt, block, fallLabel ); },
+                        [&](){ enclosing_control_structures.emplace_back( mutStmt, fallLabel ); },
                         [this](){ enclosing_control_structures.pop_back(); }
                         );
 
+                // These should already be in a block.
+                auto block = mutate( mutStmt->stmts.front().strict_as<CompoundStmt>() );
                 block->kids = fixBlock( block->kids, true );
 
@@ -397 +396 @@
                 Entry & entry = enclosing_control_structures.back();
                 if ( entry.isFallUsed() ) {
-                        mutStmt->stmts.push_back( labelledNullStmt( block->location, entry.useFallExit() ) );
+                        mutStmt->stmts.push_back( labelledNullStmt( mutStmt->location, entry.useFallExit() ) );
                 }
         }
@@ -434 +433 @@
 }
 
-static bool isDefaultCase( const ptr<CaseClause> & caseClause ) {
-        return caseClause->isDefault();
+bool isDefaultCase( const ptr<Stmt> & stmt ) {
+        const CaseStmt * caseStmt = stmt.strict_as<CaseStmt>();
+        return caseStmt->isDefault();
 }
 
 void MultiLevelExitCore::previsit( const SwitchStmt * stmt ) {
         Label label = newLabel( "switchBreak", stmt );
-        auto it = find_if( stmt->cases.rbegin(), stmt->cases.rend(), isDefaultCase );
-
-        const CaseClause * defaultCase = it != stmt->cases.rend() ? (*it) : nullptr;
-        Label defaultLabel = defaultCase ? newLabel( "fallThroughDefault", defaultCase->location ) : Label( stmt->location, "" );
+        auto it = find_if( stmt->stmts.rbegin(), stmt->stmts.rend(), isDefaultCase );
+
+        const CaseStmt * defaultCase = it != stmt->stmts.rend() ? (it)->strict_as<CaseStmt>() : nullptr;
+        Label defaultLabel = defaultCase ? newLabel( "fallThroughDefault", defaultCase ) : Label( stmt->location, "" );
         enclosing_control_structures.emplace_back( stmt, label, defaultLabel );
         GuardAction( [this]() { enclosing_control_structures.pop_back(); } );
@@ -449 +449 @@
         // Collect valid labels for fallthrough. It starts with all labels at this level, then remove as each is seen during
         // traversal.
-        for ( const CaseClause * caseStmt : stmt->cases ) {
+        for ( const Stmt * stmt : stmt->stmts ) {
+                auto * caseStmt = strict_dynamic_cast< const CaseStmt * >( stmt );
                 if ( caseStmt->stmts.empty() ) continue;
                 auto block = caseStmt->stmts.front().strict_as<CompoundStmt>();
@@ -470 +471 @@
                 // exit label and break to the last case, create a default case if no cases.
                 SwitchStmt * mutStmt = mutate( stmt );
-                if ( mutStmt->cases.empty() ) {
-                        mutStmt->cases.push_back( new CaseClause( mutStmt->location, nullptr, {} ) );
-                }
-
-                auto caseStmt = mutStmt->cases.back().get();
+                if ( mutStmt->stmts.empty() ) {
+                        mutStmt->stmts.push_back( new CaseStmt( mutStmt->location, nullptr, {} ) );
+                }
+
+                auto caseStmt = mutStmt->stmts.back().strict_as<CaseStmt>();
                 auto mutCase = mutate( caseStmt );
-                mutStmt->cases.back() = mutCase;
+                mutStmt->stmts.back() = mutCase;
 
                 Label label( mutCase->location, "breakLabel" );
@@ -513 +514 @@
 }
 
-void MultiLevelExitCore::previsit( const FinallyClause * ) {
+void MultiLevelExitCore::previsit( const FinallyStmt * ) {
         GuardAction([this, old = move( enclosing_control_structures)](){ enclosing_control_structures = move(old); });
         enclosing_control_structures = vector<Entry>();