Changes in / [e5628db:491bb81]

File:

• src/ControlStruct/MultiLevelExit.cpp (modified) (1 diff)

src/ControlStruct/MultiLevelExit.cpp

@@ -589 +589 @@
                 }
 
-                ptr<Stmt> else_stmt = nullptr;
-                Stmt * loop_kid = nullptr;
+                try {
+                        ret.push_back( kid->accept( *visitor ) );
+                } catch ( SemanticErrorException & e ) {
+                        errors.append( e );
+                }
+
                 // check if loop node and if so add else clause if it exists
                 const WhileDoStmt * whilePtr = dynamic_cast<const WhileDoStmt *>(kid.get());
-                if ( whilePtr && whilePtr->else_) {
-                        else_stmt = whilePtr->else_;
-                        WhileDoStmt * mutate_ptr = mutate(whilePtr);
-                        mutate_ptr->else_ = nullptr;
-                        loop_kid = mutate_ptr;
-                }
+                if ( whilePtr && whilePtr->else_) ret.push_back(whilePtr->else_);
                 const ForStmt * forPtr = dynamic_cast<const ForStmt *>(kid.get());
-                if ( forPtr && forPtr->else_) {
-                        else_stmt = forPtr->else_;
-                        ForStmt * mutate_ptr = mutate(forPtr);
-                        mutate_ptr->else_ = nullptr;
-                        loop_kid = mutate_ptr;
-                }
-
-                try {
-                        if (else_stmt) ret.push_back( loop_kid->accept( *visitor ) );
-                        else ret.push_back( kid->accept( *visitor ) );
-                } catch ( SemanticErrorException & e ) {
-                        errors.append( e );
-                }
-
-                if (else_stmt) ret.push_back(else_stmt);
+                if ( forPtr && forPtr->else_) ret.push_back(forPtr->else_);
 
                 if ( ! break_label.empty() ) {