Changes in src/SynTree/Statement.h [e612146c:871cdb4]

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 : Sun Sep  3 20:46:46 2017
-// Update Count     : 77
+// Last Modified On : Thu Aug 17 15:37:53 2017
+// Update Count     : 72
 //
 
@@ -98 +98 @@
   public:
         bool voltile;
-        Expression *instruction;
+        ConstantExpr *instruction;
         std::list<Expression *> output, input;
         std::list<ConstantExpr *> clobber;
         std::list<Label> gotolabels;
 
-        AsmStmt( std::list<Label> labels, bool voltile, Expression *instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels );
+        AsmStmt( std::list<Label> labels, bool voltile, ConstantExpr *instruction, std::list<Expression *> input, std::list<Expression *> output, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels );
         AsmStmt( const AsmStmt &other );
         virtual ~AsmStmt();
@@ -109 +109 @@
         bool get_voltile() { return voltile; }
         void set_voltile( bool newValue ) { voltile = newValue; }
-        Expression * get_instruction() { return instruction; }
-        void set_instruction( Expression * newValue ) { instruction = newValue; }
-        std::list<Expression *> & get_output() { return output; }
-        void set_output( const std::list<Expression *> & newValue ) { output = newValue; }
-        std::list<Expression *> & get_input() { return input; }
+        ConstantExpr *get_instruction() { return instruction; }
+        void set_instruction( ConstantExpr *newValue ) { instruction = newValue; }
+        std::list<Expression *> &get_output() { return output; }
+        void set_output( const std::list<Expression *> &newValue ) { output = newValue; }
+        std::list<Expression *> &get_input() { return input; }
         void set_input( const std::list<Expression *> &newValue ) { input = newValue; }
-        std::list<ConstantExpr *> & get_clobber() { return clobber; }
+        std::list<ConstantExpr *> &get_clobber() { return clobber; }
         void set_clobber( const std::list<ConstantExpr *> &newValue ) { clobber = newValue; }
-        std::list<Label> & get_gotolabels() { return gotolabels; }
+        std::list<Label> &get_gotolabels() { return gotolabels; }
         void set_gotolabels( const std::list<Label> &newValue ) { gotolabels = newValue; }
 
-        virtual AsmStmt * clone() const { return new AsmStmt( *this ); }
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Statement * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, int indent = 0 ) const;
+        virtual AsmStmt *clone() const { return new AsmStmt( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
 };
 
@@ -155 +155 @@
   public:
         Expression * condition;
+        std::list<Statement *> statements;
 
         SwitchStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &statements );
@@ -170 +171 @@
         virtual SwitchStmt *clone() const { return new SwitchStmt( *this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
-  private:
-        std::list<Statement *> statements;
+
 };
 
@@ -327 +327 @@
 class TryStmt : public Statement {
   public:
-        CompoundStmt *block;
+        CompoundStmt * block;
         std::list<CatchStmt *> handlers;
-        FinallyStmt *finallyBlock;
+        FinallyStmt * finallyBlock;
 
         TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock = 0 );