Changeset 17cb385 for src/SynTree/Statement.h

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

File:

• src/SynTree/Statement.h (modified) (6 diffs)

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 : Wed Feb  2 11:49:17 2022
+// Update Count     : 94
 //
 
@@ -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, const std::list<Statement *> & initialization, bool isDoWhile = false );
+        WhileDoStmt( Expression * condition, Statement * body, Statement * else_, const 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();