Index: src/SynTree/Mutator.h =================================================================== --- src/SynTree/Mutator.h (revision 6cebfefc948a4195311c8d0203ba01ed9c1a1bb3) +++ src/SynTree/Mutator.h (revision fde0a583854b9d8d0c727dba8e9979347f11e82c) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Mar 12 18:35:36 2021 -// Update Count : 18 +// Last Modified On : Tue Feb 1 09:26:49 2022 +// Update Count : 20 // #pragma once @@ -42,5 +42,5 @@ virtual Statement * mutate( DirectiveStmt * dirStmt ) = 0; virtual Statement * mutate( IfStmt * ifStmt ) = 0; - virtual Statement * mutate( WhileStmt * whileStmt ) = 0; + virtual Statement * mutate( WhileDoStmt * whileDoStmt ) = 0; virtual Statement * mutate( ForStmt * forStmt ) = 0; virtual Statement * mutate( SwitchStmt * switchStmt ) = 0; Index: src/SynTree/Statement.cc =================================================================== --- src/SynTree/Statement.cc (revision 6cebfefc948a4195311c8d0203ba01ed9c1a1bb3) +++ src/SynTree/Statement.cc (revision fde0a583854b9d8d0c727dba8e9979347f11e82c) @@ -9,7 +9,7 @@ // Author : Richard C. Bilson // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Andrew Beach -// Last Modified On : Mon Jan 20 16:03:00 2020 -// Update Count : 71 +// Last Modified By : Peter A. Buhr +// Last Modified On : Tue Feb 1 17:55:29 2022 +// Update Count : 79 // @@ -145,9 +145,9 @@ } -IfStmt::IfStmt( Expression * condition, Statement * thenPart, Statement * elsePart, std::list initialization ): - Statement(), condition( condition ), thenPart( thenPart ), elsePart( elsePart ), initialization( initialization ) {} +IfStmt::IfStmt( Expression * condition, Statement * then, Statement * else_, std::list initialization ): + Statement(), condition( condition ), then( then ), else_( else_ ), initialization( initialization ) {} IfStmt::IfStmt( const IfStmt & other ) : - Statement( other ), condition( maybeClone( other.condition ) ), thenPart( maybeClone( other.thenPart ) ), elsePart( maybeClone( other.elsePart ) ) { + Statement( other ), condition( maybeClone( other.condition ) ), then( maybeClone( other.then ) ), else_( maybeClone( other.else_ ) ) { cloneAll( other.initialization, initialization ); } @@ -156,6 +156,6 @@ deleteAll( initialization ); delete condition; - delete thenPart; - delete elsePart; + delete then; + delete else_; } @@ -177,10 +177,10 @@ os << indent+1; - thenPart->print( os, indent+1 ); - - if ( elsePart != nullptr ) { + then->print( os, indent+1 ); + + if ( else_ != nullptr ) { os << indent << "... else: " << endl; os << indent+1; - elsePart->print( os, indent+1 ); + else_->print( os, indent+1 ); } // if } @@ -246,18 +246,22 @@ } -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 ): +WhileDoStmt::WhileDoStmt( Expression * condition, Statement * body, 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_, std::list< Statement * > & initialization, bool isDoWhile ): + Statement(), condition( condition), body( body ), else_( else_ ), initialization( initialization ), isDoWhile( isDoWhile) { +} + +WhileDoStmt::WhileDoStmt( const WhileDoStmt & other ): Statement( other ), condition( maybeClone( other.condition ) ), body( maybeClone( other.body ) ), isDoWhile( other.isDoWhile ) { } -WhileStmt::~WhileStmt() { +WhileDoStmt::~WhileDoStmt() { delete body; delete condition; } -void WhileStmt::print( std::ostream & os, Indenter indent ) const { +void WhileDoStmt::print( std::ostream & os, Indenter indent ) const { os << "While on condition: " << endl ; condition->print( os, indent+1 ); @@ -268,10 +272,10 @@ } -ForStmt::ForStmt( std::list initialization, Expression * condition, Expression * increment, Statement * body ): - Statement(), initialization( initialization ), condition( condition ), increment( increment ), body( body ) { +ForStmt::ForStmt( std::list initialization, Expression * condition, Expression * increment, Statement * body, Statement * else_ ): + Statement(), initialization( initialization ), condition( condition ), increment( increment ), body( body ), else_( else_ ) { } ForStmt::ForStmt( const ForStmt & other ): - Statement( other ), condition( maybeClone( other.condition ) ), increment( maybeClone( other.increment ) ), body( maybeClone( other.body ) ) { + Statement( other ), condition( maybeClone( other.condition ) ), increment( maybeClone( other.increment ) ), body( maybeClone( other.body ) ), else_( maybeClone( other.else_ ) ) { cloneAll( other.initialization, initialization ); @@ -283,4 +287,5 @@ delete increment; delete body; + delete else_; } @@ -311,4 +316,9 @@ 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; Index: src/SynTree/Statement.h =================================================================== --- src/SynTree/Statement.h (revision 6cebfefc948a4195311c8d0203ba01ed9c1a1bb3) +++ src/SynTree/Statement.h (revision fde0a583854b9d8d0c727dba8e9979347f11e82c) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Jan 10 14:13:24 2020 -// Update Count : 85 +// Last Modified On : Tue Feb 1 17:07:32 2022 +// Update Count : 93 // @@ -148,9 +148,9 @@ public: Expression * condition; - Statement * thenPart; - Statement * elsePart; + Statement * then; + Statement * else_; std::list initialization; - IfStmt( Expression * condition, Statement * thenPart, Statement * elsePart, + IfStmt( Expression * condition, Statement * then, Statement * else_, std::list initialization = std::list() ); IfStmt( const IfStmt & other ); @@ -160,8 +160,8 @@ Expression * get_condition() { return condition; } void set_condition( Expression * newValue ) { condition = newValue; } - Statement * get_thenPart() { return thenPart; } - void set_thenPart( Statement * newValue ) { thenPart = newValue; } - Statement * get_elsePart() { return elsePart; } - void set_elsePart( Statement * newValue ) { elsePart = newValue; } + Statement * get_then() { return then; } + void set_then( Statement * newValue ) { then = newValue; } + Statement * get_else() { return else_; } + void set_else( Statement * newValue ) { else_ = newValue; } virtual IfStmt * clone() const override { return new IfStmt( *this ); } @@ -225,14 +225,16 @@ }; -class WhileStmt : public Statement { +class WhileDoStmt : public Statement { public: Expression * condition; Statement * body; + Statement * else_; std::list initialization; bool isDoWhile; - WhileStmt( Expression * condition, Statement * body, std::list & initialization, bool isDoWhile = false ); - WhileStmt( const WhileStmt & other ); - virtual ~WhileStmt(); + WhileDoStmt( Expression * condition, Statement * body, std::list & initialization, bool isDoWhile = false ); + WhileDoStmt( Expression * condition, Statement * body, Statement * els, std::list & initialization, bool isDoWhile = false ); + WhileDoStmt( const WhileDoStmt & other ); + virtual ~WhileDoStmt(); Expression * get_condition() { return condition; } @@ -243,5 +245,5 @@ void set_isDoWhile( bool newValue ) { isDoWhile = newValue; } - virtual WhileStmt * clone() const override { return new WhileStmt( *this ); } + virtual WhileDoStmt * clone() const override { return new WhileDoStmt( *this ); } virtual void accept( Visitor & v ) override { v.visit( this ); } virtual void accept( Visitor & v ) const override { v.visit( this ); } @@ -256,6 +258,7 @@ Expression * increment; Statement * body; - - ForStmt( std::list initialization, Expression * condition = nullptr, Expression * increment = nullptr, Statement * body = nullptr ); + Statement * else_; + + ForStmt( std::list initialization, Expression * condition = nullptr, Expression * increment = nullptr, Statement * body = nullptr, Statement * else_ = nullptr ); ForStmt( const ForStmt & other ); virtual ~ForStmt(); Index: src/SynTree/SynTree.h =================================================================== --- src/SynTree/SynTree.h (revision 6cebfefc948a4195311c8d0203ba01ed9c1a1bb3) +++ src/SynTree/SynTree.h (revision fde0a583854b9d8d0c727dba8e9979347f11e82c) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Mar 12 18:56:44 2021 -// Update Count : 13 +// Last Modified On : Tue Feb 1 09:22:33 2022 +// Update Count : 14 // @@ -45,5 +45,5 @@ class DirectiveStmt; class IfStmt; -class WhileStmt; +class WhileDoStmt; class ForStmt; class SwitchStmt; Index: src/SynTree/Visitor.h =================================================================== --- src/SynTree/Visitor.h (revision 6cebfefc948a4195311c8d0203ba01ed9c1a1bb3) +++ src/SynTree/Visitor.h (revision fde0a583854b9d8d0c727dba8e9979347f11e82c) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Mar 12 18:35:35 2021 -// Update Count : 15 +// Last Modified On : Tue Feb 1 09:26:57 2022 +// Update Count : 17 // @@ -60,6 +60,6 @@ virtual void visit( IfStmt * node ) { visit( const_cast(node) ); } virtual void visit( const IfStmt * ifStmt ) = 0; - virtual void visit( WhileStmt * node ) { visit( const_cast(node) ); } - virtual void visit( const WhileStmt * whileStmt ) = 0; + virtual void visit( WhileDoStmt * node ) { visit( const_cast(node) ); } + virtual void visit( const WhileDoStmt * whileDoStmt ) = 0; virtual void visit( ForStmt * node ) { visit( const_cast(node) ); } virtual void visit( const ForStmt * forStmt ) = 0;