Changeset b56ad5e for src/CodeGen/CodeGenerator.cc

Timestamp:

Feb 4, 2022, 10:10:34 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

f8143a6

Parents:

5f3ba11 (diff), 67e86ae6 (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.cc (modified) (5 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 12 19:00:42 2021
-// Update Count     : 536
+// Last Modified On : Wed Feb  2 20:30:30 2022
+// Update Count     : 541
 //
 #include "CodeGenerator.h"
@@ -42 +42 @@
         bool wantSpacing( Statement * stmt) {
                 return dynamic_cast< IfStmt * >( stmt ) || dynamic_cast< CompoundStmt * >( stmt ) ||
-                        dynamic_cast< WhileStmt * >( stmt ) || dynamic_cast< ForStmt * >( stmt ) || dynamic_cast< SwitchStmt *>( stmt );
+                        dynamic_cast< WhileDoStmt * >( stmt ) || dynamic_cast< ForStmt * >( stmt ) || dynamic_cast< SwitchStmt *>( stmt );
         }
 
@@ -955 +955 @@
                 output << " ) ";
 
-                ifStmt->get_thenPart()->accept( *visitor );
-
-                if ( ifStmt->get_elsePart() != 0) {
+                ifStmt->get_then()->accept( *visitor );
+
+                if ( ifStmt->get_else() != 0) {
                         output << " else ";
-                        ifStmt->get_elsePart()->accept( *visitor );
+                        ifStmt->get_else()->accept( *visitor );
                 } // if
         }
@@ -1020 +1020 @@
                         output << "fallthru";
                         break;
+                  default: ;                                                                    // prevent warning
                 } // switch
                 // print branch target for labelled break/continue/fallthru in debug mode
@@ -1125 +1126 @@
         }
 
-        void CodeGenerator::postvisit( WhileStmt * whileStmt ) {
-                if ( whileStmt->get_isDoWhile() ) {
+        void CodeGenerator::postvisit( WhileDoStmt * whileDoStmt ) {
+                if ( whileDoStmt->get_isDoWhile() ) {
                         output << "do";
                 } else {
                         output << "while (";
-                        whileStmt->get_condition()->accept( *visitor );
+                        whileDoStmt->get_condition()->accept( *visitor );
                         output << ")";
                 } // if
                 output << " ";
 
-                output << CodeGenerator::printLabels( whileStmt->get_body()->get_labels() );
-                whileStmt->get_body()->accept( *visitor );
+                output << CodeGenerator::printLabels( whileDoStmt->get_body()->get_labels() );
+                whileDoStmt->get_body()->accept( *visitor );
 
                 output << indent;
 
-                if ( whileStmt->get_isDoWhile() ) {
+                if ( whileDoStmt->get_isDoWhile() ) {
                         output << " while (";
-                        whileStmt->get_condition()->accept( *visitor );
+                        whileDoStmt->get_condition()->accept( *visitor );
                         output << ");";
                 } // if