Changes in src/SynTree/Statement.h [6180274:6cebfef]

File:

• src/SynTree/Statement.h (modified) (10 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 : Wed Feb  2 20:15:30 2022
-// Update Count     : 98
+// Last Modified On : Fri Jan 10 14:13:24 2020
+// Update Count     : 85
 //
 
@@ -107 +107 @@
         std::list<Label> gotolabels;
 
-        AsmStmt( bool voltile, Expression * instruction, const std::list<Expression *> output, const std::list<Expression *> input, const std::list<ConstantExpr *> clobber, const std::list<Label> gotolabels );
+        AsmStmt( bool voltile, Expression * instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels );
         AsmStmt( const AsmStmt & other );
         virtual ~AsmStmt();
@@ -148 +148 @@
   public:
         Expression * condition;
-        Statement * then;
-        Statement * else_;
+        Statement * thenPart;
+        Statement * elsePart;
         std::list<Statement *> initialization;
 
-        IfStmt( Expression * condition, Statement * then, Statement * else_,
-                        const std::list<Statement *> initialization = std::list<Statement *>() );
+        IfStmt( Expression * condition, Statement * thenPart, Statement * elsePart,
+                        std::list<Statement *> initialization = std::list<Statement *>() );
         IfStmt( const IfStmt & other );
         virtual ~IfStmt();
@@ -160 +160 @@
         Expression * get_condition() { return condition; }
         void set_condition( Expression * newValue ) { condition = 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; }
+        Statement * get_thenPart() { return thenPart; }
+        void set_thenPart( Statement * newValue ) { thenPart = newValue; }
+        Statement * get_elsePart() { return elsePart; }
+        void set_elsePart( Statement * newValue ) { elsePart = newValue; }
 
         virtual IfStmt * clone() const override { return new IfStmt( *this ); }
@@ -225 +225 @@
 };
 
-class WhileDoStmt : public Statement {
+class WhileStmt : public Statement {
   public:
         Expression * condition;
         Statement * body;
-        Statement * else_;
         std::list<Statement *> initialization;
         bool isDoWhile;
 
-        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();
+        WhileStmt( Expression * condition, Statement * body, std::list<Statement *> & initialization, bool isDoWhile = false );
+        WhileStmt( const WhileStmt & other );
+        virtual ~WhileStmt();
 
         Expression * get_condition() { return condition; }
@@ -245 +243 @@
         void set_isDoWhile( bool newValue ) { isDoWhile = newValue; }
 
-        virtual WhileDoStmt * clone() const override { return new WhileDoStmt( *this ); }
+        virtual WhileStmt * clone() const override { return new WhileStmt( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
         virtual void accept( Visitor & v ) const override { v.visit( this ); }
@@ -258 +256 @@
         Expression * increment;
         Statement * body;
-        Statement * else_;
-
-        ForStmt( const std::list<Statement *> initialization, Expression * condition = nullptr, Expression * increment = nullptr, Statement * body = nullptr, Statement * else_ = nullptr );
+
+        ForStmt( std::list<Statement *> initialization, Expression * condition = nullptr, Expression * increment = nullptr, Statement * body = nullptr );
         ForStmt( const ForStmt & other );
         virtual ~ForStmt();
@@ -281 +278 @@
 class BranchStmt : public Statement {
   public:
-        enum Type { Goto, Break, Continue, FallThrough, FallThroughDefault, BranchStmts };
+        enum Type { Goto = 0, Break, Continue, FallThrough, FallThroughDefault };
 
         // originalTarget kept for error messages.
@@ -360 +357 @@
         FinallyStmt * finallyBlock;
 
-        TryStmt( CompoundStmt * tryBlock, const std::list<CatchStmt *> & handlers, FinallyStmt * finallyBlock = nullptr );
+        TryStmt( CompoundStmt * tryBlock, std::list<CatchStmt *> & handlers, FinallyStmt * finallyBlock = nullptr );
         TryStmt( const TryStmt & other );
         virtual ~TryStmt();
@@ -543 +540 @@
         std::list<Expression *> mutexObjs; // list of mutex objects to acquire
 
-        MutexStmt( Statement * stmt, const std::list<Expression *> mutexObjs );
+        MutexStmt( Statement * stmt, std::list<Expression *> mutexObjs );
         MutexStmt( const MutexStmt & other );
         virtual ~MutexStmt();