Fixed #678: Second attempt

andreasfertig · Jan 10, 2025 · 2976ec7 · 2976ec7
1 parent 9b66839
commit 2976ec7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/CodeGenerator.cpp b/CodeGenerator.cpp
@@ -555,7 +555,8 @@ void CodeGenerator::InsertArg(const SwitchStmt* stmt)
 
 void CodeGenerator::InsertArg(const WhileStmt* stmt)
 {
-    const auto* conditionVar{stmt->getConditionVariable()};
+    auto* rwStmt = const_cast<WhileStmt*>(stmt);
+    auto* conditionVar{rwStmt->getConditionVariable()};
 
     {
         // We need to handle the case that a lambda is used in the init-statement of the for-loop.
@@ -571,7 +572,17 @@ void CodeGenerator::InsertArg(const WhileStmt* stmt)
         WrapInParens([&]() { InsertArg(stmt->getCond()); }, AddSpaceAtTheEnd::Yes);
     }
 
-    WrapInCompoundIfNeeded(stmt->getBody(), AddNewLineAfter::Yes);
+    if(not conditionVar) {
+        WrapInCompoundIfNeeded(stmt->getBody(), AddNewLineAfter::Yes);
+    } else {
+        const auto&    ctx = GetGlobalAST();
+        StmtsContainer bodyStmts{};
+
+        bodyStmts.AddBodyStmts(rwStmt->getBody());
+        bodyStmts.AddBodyStmts(Assign(conditionVar, conditionVar->getInit()));
+
+        InsertArg(mkCompoundStmt(bodyStmts, stmt->getBeginLoc(), stmt->getEndLoc()));
+    }
 
     if(conditionVar) {
         mOutputFormatHelper.CloseScope();

diff --git a/tests/Issue678.expect b/tests/Issue678.expect
@@ -16,8 +16,8 @@ int main()
         break;
       } 
 
+      i = next();
     }
-
   }
   return 0;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,8 +16,8 @@ int main() @@
             break;
           }
+          i = next();
         }
       }
       return 0;
     }