Changeset 17cb385 for src/CodeGen

Timestamp:

Feb 2, 2022, 7:51:30 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

941e14a

Parents:

fc72696c (diff), 4e7171f (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

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (4 diffs)
• CodeGenerator.h (modified) (2 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 : Tue Feb  1 16:29:25 2022
+// Update Count     : 540
 //
 #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
         }
@@ -1125 +1125 @@
         }
 
-        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

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 12 18:35:38 2021
-// Update Count     : 63
+// Last Modified On : Tue Feb  1 09:23:21 2022
+// Update Count     : 64
 //
 
@@ -116 +116 @@
                 void postvisit( WaitForStmt * );
                 void postvisit( WithStmt * );
-                void postvisit( WhileStmt * );
+                void postvisit( WhileDoStmt * );
                 void postvisit( ForStmt * );
                 void postvisit( NullStmt * );