Changes in src/SynTree/Statement.cc [4e7171f:6cebfef]

File:

• src/SynTree/Statement.cc (modified) (8 diffs)

src/SynTree/Statement.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  2 11:55:19 2022
-// Update Count     : 80
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jan 20 16:03:00 2020
+// Update Count     : 71
 //
 
@@ -145 +145 @@
 }
 
-IfStmt::IfStmt( Expression * condition, Statement * then, Statement * else_, std::list<Statement *> initialization ):
-        Statement(), condition( condition ), then( then ), else_( else_ ), initialization( initialization ) {}
+IfStmt::IfStmt( Expression * condition, Statement * thenPart, Statement * elsePart, std::list<Statement *> initialization ):
+        Statement(), condition( condition ), thenPart( thenPart ), elsePart( elsePart ), initialization( initialization ) {}
 
 IfStmt::IfStmt( const IfStmt & other ) :
-        Statement( other ), condition( maybeClone( other.condition ) ), then( maybeClone( other.then ) ), else_( maybeClone( other.else_ ) ) {
+        Statement( other ), condition( maybeClone( other.condition ) ), thenPart( maybeClone( other.thenPart ) ), elsePart( maybeClone( other.elsePart ) ) {
         cloneAll( other.initialization, initialization );
 }
@@ -156 +156 @@
         deleteAll( initialization );
         delete condition;
-        delete then;
-        delete else_;
+        delete thenPart;
+        delete elsePart;
 }
 
@@ -177 +177 @@
 
         os << indent+1;
-        then->print( os, indent+1 );
-
-        if ( else_ != nullptr ) {
+        thenPart->print( os, indent+1 );
+
+        if ( elsePart != nullptr ) {
                 os << indent << "... else: " << endl;
                 os << indent+1;
-                else_->print( os, indent+1 );
+                elsePart->print( os, indent+1 );
         } // if
 }
@@ -246 +246 @@
 }
 
-WhileDoStmt::WhileDoStmt( Expression * condition, Statement * body, const std::list< Statement * > & initialization, bool isDoWhile ):
-        Statement(), condition( condition ), body( body ), else_( nullptr ), initialization( initialization ), isDoWhile( isDoWhile) {
-}
-
-WhileDoStmt::WhileDoStmt( Expression * condition, Statement * body, Statement * else_, const std::list< Statement * > & initialization, bool isDoWhile ):
-        Statement(), condition( condition), body( body ), else_( else_ ), initialization( initialization ), isDoWhile( isDoWhile) {
-}
-
-WhileDoStmt::WhileDoStmt( const WhileDoStmt & other ):
+WhileStmt::WhileStmt( Expression * condition, Statement * body, std::list< Statement * > & initialization, bool isDoWhile ):
+        Statement(), condition( condition), body( body), initialization( initialization ), isDoWhile( isDoWhile) {
+}
+
+WhileStmt::WhileStmt( const WhileStmt & other ):
         Statement( other ), condition( maybeClone( other.condition ) ), body( maybeClone( other.body ) ), isDoWhile( other.isDoWhile ) {
 }
 
-WhileDoStmt::~WhileDoStmt() {
+WhileStmt::~WhileStmt() {
         delete body;
         delete condition;
 }
 
-void WhileDoStmt::print( std::ostream & os, Indenter indent ) const {
+void WhileStmt::print( std::ostream & os, Indenter indent ) const {
         os << "While on condition: " << endl ;
         condition->print( os, indent+1 );
@@ -272 +268 @@
 }
 
-ForStmt::ForStmt( std::list<Statement *> initialization, Expression * condition, Expression * increment, Statement * body, Statement * else_ ):
-        Statement(), initialization( initialization ), condition( condition ), increment( increment ), body( body ), else_( else_ ) {
+ForStmt::ForStmt( std::list<Statement *> initialization, Expression * condition, Expression * increment, Statement * body ):
+        Statement(), initialization( initialization ), condition( condition ), increment( increment ), body( body ) {
 }
 
 ForStmt::ForStmt( const ForStmt & other ):
-        Statement( other ), condition( maybeClone( other.condition ) ), increment( maybeClone( other.increment ) ), body( maybeClone( other.body ) ), else_( maybeClone( other.else_ ) ) {
+        Statement( other ), condition( maybeClone( other.condition ) ), increment( maybeClone( other.increment ) ), body( maybeClone( other.body ) ) {
                 cloneAll( other.initialization, initialization );
 
@@ -287 +283 @@
         delete increment;
         delete body;
-        delete else_;
 }
 
@@ -316 +311 @@
                 os << "\n" << indent << "... with body: \n" << indent+1;
                 body->print( os, indent+1 );
-        }
-
-        if ( else_ != nullptr ) {
-                os << "\n" << indent << "... with body: \n" << indent+1;
-                else_->print( os, indent+1 );
         }
         os << endl;