Changeset 4acd1f8

Timestamp:

Mar 11, 2026, 5:40:49 PM (14 hours ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

42bce4e

Parents:

1b6ec23

Message:

change codegen for loop else-clause to print else-clause as a compound statement

File:

• src/CodeGen/CodeGenerator.cpp (modified) (6 diffs)

src/CodeGen/CodeGenerator.cpp

@@ -10 +10 @@
 // Created On       : Tue Oct 17 15:54:00 2023
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jan 17 14:19:22 2025
-// Update Count     : 1
+// Last Modified On : Wed Mar 11 11:13:10 2026
+// Update Count     : 28
 //
 
@@ -49 +49 @@
 }
 
-CodeGenerator::LabelPrinter & CodeGenerator::LabelPrinter::operator()(
-                std::vector<ast::Label> const & l ) {
+CodeGenerator::LabelPrinter & CodeGenerator::LabelPrinter::operator()( std::vector<ast::Label> const & l ) {
         labels = &l;
         return *this;
@@ -1245 +1244 @@
                 output << "do";
         } else {
-                output << "while (";
+                output << "while ( ";
                 stmt->cond->accept( *visitor );
-                output << ")";
+                output << " )";
         }
         output << " ";
@@ -1255 +1254 @@
 
         if ( stmt->isDoWhile ) {
-                output << " while (";
+                output << " while ( ";
                 stmt->cond->accept( *visitor );
-                output << ( ( nullptr == stmt->else_ ) ? ");" : ")" );
-        }
+                output << " );";                                                                // always terminate with semi-colon
+        }
+
         if ( stmt->else_ ) {
-                output << " else ";
-                stmt->else_->accept( *visitor );
+                stmt->else_->accept( *visitor );                                // not converted in AST pass
         }
 }
 
 void CodeGenerator::postvisit( ast::ForStmt const * stmt ) {
-        // Initializer is always hoised so don't generate it.
-        // TODO: Do an assertion check?
-        output << "for (;";
+        assert( stmt->inits.empty() );                                          // initializer is hoisted
+        output << "for ( ; ";                                                           // empty initializer
 
         if ( nullptr != stmt->cond ) {
                 stmt->cond->accept( *visitor );
         }
-        output << ";";
+        output << "; ";                                                                         // separator
 
         if ( nullptr != stmt->inc ) {
@@ -1280 +1278 @@
                 expr->accept( *visitor );
         }
-        output << ") ";
+        output << " ) ";
 
         if ( nullptr != stmt->body ) {
@@ -1288 +1286 @@
 
         if ( nullptr != stmt->else_ ) {
-                assertf( !options.genC, "Loop else should not reach code generation." );
-                output << " else ";
-                stmt->else_->accept( *visitor );
+                stmt->else_->accept( *visitor );                                // not converted in AST pass
         }
 }