Changeset 3b0bc16 for src/SynTree

Timestamp:

Feb 1, 2022, 8:22:12 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

fde0a58

Parents:

729c991

Message:

change class name WhileStmt to WhileDoStmt, add else clause to WhileDoStmt and ForStmt, change names thenPart/ElsePart to then/else_

Location:

src/SynTree

Files:

• Mutator.h (modified) (2 diffs)
• Statement.cc (modified) (8 diffs)
• Statement.h (modified) (6 diffs)
• SynTree.h (modified) (2 diffs)
• Visitor.h (modified) (2 diffs)

src/SynTree/Mutator.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:36 2021
-// Update Count     : 18
+// Last Modified On : Tue Feb  1 09:26:49 2022
+// Update Count     : 20
 //
 #pragma once
@@ -42 +42 @@
         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;

src/SynTree/Statement.cc

@@ -9 +9 @@
 // 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 +145 @@
 }
 
-IfStmt::IfStmt( Expression * condition, Statement * thenPart, Statement * elsePart, std::list<Statement *> initialization ):
-        Statement(), condition( condition ), thenPart( thenPart ), elsePart( elsePart ), initialization( initialization ) {}
+IfStmt::IfStmt( Expression * condition, Statement * then, Statement * else_, std::list<Statement *> 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 +156 @@
         deleteAll( initialization );
         delete condition;
-        delete thenPart;
-        delete elsePart;
+        delete then;
+        delete else_;
 }
 
@@ -177 +177 @@
 
         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 +246 @@
 }
 
-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 +272 @@
 }
 
-ForStmt::ForStmt( std::list<Statement *> initialization, Expression * condition, Expression * increment, Statement * body ):
-        Statement(), initialization( initialization ), condition( condition ), increment( increment ), body( body ) {
+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( 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 +287 @@
         delete increment;
         delete body;
+        delete else_;
 }
 
@@ -311 +316 @@
                 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;

src/SynTree/Statement.h

@@ -10 +10 @@
 // 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 +148 @@
   public:
         Expression * condition;
-        Statement * thenPart;
-        Statement * elsePart;
+        Statement * then;
+        Statement * else_;
         std::list<Statement *> initialization;
 
-        IfStmt( Expression * condition, Statement * thenPart, Statement * elsePart,
+        IfStmt( Expression * condition, Statement * then, Statement * else_,
                         std::list<Statement *> initialization = std::list<Statement *>() );
         IfStmt( const IfStmt & other );
@@ -160 +160 @@
         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 +225 @@
 };
 
-class WhileStmt : public Statement {
+class WhileDoStmt : public Statement {
   public:
         Expression * condition;
         Statement * body;
+        Statement * else_;
         std::list<Statement *> initialization;
         bool isDoWhile;
 
-        WhileStmt( Expression * condition, Statement * body, std::list<Statement *> & initialization, bool isDoWhile = false );
-        WhileStmt( const WhileStmt & other );
-        virtual ~WhileStmt();
+        WhileDoStmt( Expression * condition, Statement * body, std::list<Statement *> & initialization, bool isDoWhile = false );
+        WhileDoStmt( Expression * condition, Statement * body, Statement * els, std::list<Statement *> & initialization, bool isDoWhile = false );
+        WhileDoStmt( const WhileDoStmt & other );
+        virtual ~WhileDoStmt();
 
         Expression * get_condition() { return condition; }
@@ -243 +245 @@
         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 +258 @@
         Expression * increment;
         Statement * body;
-
-        ForStmt( std::list<Statement *> initialization, Expression * condition = nullptr, Expression * increment = nullptr, Statement * body = nullptr );
+        Statement * else_;
+
+        ForStmt( std::list<Statement *> initialization, Expression * condition = nullptr, Expression * increment = nullptr, Statement * body = nullptr, Statement * else_ = nullptr );
         ForStmt( const ForStmt & other );
         virtual ~ForStmt();

src/SynTree/SynTree.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:56:44 2021
-// Update Count     : 13
+// Last Modified On : Tue Feb  1 09:22:33 2022
+// Update Count     : 14
 //
 
@@ -45 +45 @@
 class DirectiveStmt;
 class IfStmt;
-class WhileStmt;
+class WhileDoStmt;
 class ForStmt;
 class SwitchStmt;

src/SynTree/Visitor.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:35 2021
-// Update Count     : 15
+// Last Modified On : Tue Feb  1 09:26:57 2022
+// Update Count     : 17
 //
 
@@ -60 +60 @@
         virtual void visit( IfStmt * node ) { visit( const_cast<const IfStmt *>(node) ); }
         virtual void visit( const IfStmt * ifStmt ) = 0;
-        virtual void visit( WhileStmt * node ) { visit( const_cast<const WhileStmt *>(node) ); }
-        virtual void visit( const WhileStmt * whileStmt ) = 0;
+        virtual void visit( WhileDoStmt * node ) { visit( const_cast<const WhileDoStmt *>(node) ); }
+        virtual void visit( const WhileDoStmt * whileDoStmt ) = 0;
         virtual void visit( ForStmt * node ) { visit( const_cast<const ForStmt *>(node) ); }
         virtual void visit( const ForStmt * forStmt ) = 0;