Merge pull request #953 from GaijinEntertainment/clean_cond_stop

if both sides of the cond stop - block section stops
GaijinEntertainment · Feb 8, 2024 · c724d94 · c724d94
2 parents 3a7e611 + 7630f61
commit c724d94
Showing 1 changed file with 38 additions and 0 deletions.
diff --git a/src/ast/ast_block_folding.cpp b/src/ast/ast_block_folding.cpp
@@ -117,6 +117,34 @@ namespace das {
         }
     };
 
+    bool doesExprTerminates ( const ExpressionPtr & expr ) {
+        if ( !expr ) return false;
+        if ( expr->rtti_isBlock() ) {
+            auto pBlock = static_pointer_cast<ExprBlock>(expr);
+            for ( auto & e : pBlock->list ) {
+                if ( e->rtti_isReturn() || e->rtti_isBreak() || e->rtti_isContinue() ) {
+                    return true;
+                }
+                if ( e->rtti_isBlock() ) {
+                    if ( doesExprTerminates(e) ) {
+                        return true;
+                    }
+                }
+            }
+        } else if ( expr->rtti_isIfThenElse() ) {
+            auto pIte = static_pointer_cast<ExprIfThenElse>(expr);
+            if ( doesExprTerminates(pIte->if_true) && doesExprTerminates(pIte->if_false) ) {
+                return true;
+            }
+        } else if ( expr->rtti_isWith() ) {
+            auto pWith = static_pointer_cast<ExprWith>(expr);
+            if ( pWith->body && doesExprTerminates(pWith->body) ) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     class BlockFolding : public PassVisitor {
     protected:
         das_set<int32_t> labels;
@@ -165,6 +193,16 @@ namespace das {
                         continue;
                     }
                 }
+                if ( expr->rtti_isIfThenElse() && doesExprTerminates(expr) ) {
+                    if ( stopAtExit ) {
+                        list.push_back(expr);
+                        break;
+                    } else {
+                        list.push_back(expr);
+                        skipTilLabel = true;
+                        continue;
+                    }
+                }
                 if ( expr->rtti_isBlock() ) {
                     auto pBlock = static_pointer_cast<ExprBlock>(expr);
                     if ( !pBlock->isClosure && !pBlock->finalList.size() ) {