Changeset 97f9619 for src/CodeGen/CodeGenerator.cpp

Timestamp:

Jul 16, 2024, 10:35:29 PM (6 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

0097d08

Parents:

68ea8d2 (diff), 88bc876 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/CodeGen/CodeGenerator.cpp

@@ -1195 +1195 @@
         stmt->body->accept( *visitor );
 
-        output << indent;
-
         if ( stmt->isDoWhile ) {
                 output << " while (";
                 stmt->cond->accept( *visitor );
-                output << ");";
+                output << ( ( nullptr == stmt->else_ ) ? ");" : ")" );
+        }
+        if ( stmt->else_ ) {
+                output << " else ";
+                stmt->else_->accept( *visitor );
         }
 }
@@ -1225 +1227 @@
                 stmt->body->accept( *visitor );
         }
+
+        if ( nullptr != stmt->else_ ) {
+                assertf( !options.genC, "Loop else should not reach code generation." );
+                output << " else ";
+                stmt->else_->accept( *visitor );
+        }
 }