Changes in src/SynTree/Statement.h [8688ce1:7f5566b]

File:

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

src/SynTree/Statement.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Statement.h --
+// Statement.h -- 
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:26:02 2016
-// Update Count     : 64
+// Last Modified On : Sat Jul 25 18:25:37 2015
+// Update Count     : 44
 //
 
@@ -21 +21 @@
 #include "Mutator.h"
 #include "Common/SemanticError.h"
-#include "Type.h"
-#include "Label.h"
 
 class Statement {
@@ -59 +57 @@
   public:
         ExprStmt( std::list<Label> labels, Expression *expr );
-        ExprStmt( const ExprStmt &other );
         virtual ~ExprStmt();
 
@@ -76 +73 @@
   public:
         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();
 
@@ -107 +103 @@
   public:
         IfStmt( std::list<Label> labels, Expression *condition, Statement *thenPart, Statement *elsePart );
-        IfStmt( const IfStmt &other );
         virtual ~IfStmt();
 
@@ -116 +111 @@
         Statement *get_elsePart() { return elsePart; }
         void set_elsePart( Statement *newValue ) { elsePart = newValue; }
-
+        
         virtual IfStmt *clone() const { return new IfStmt( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -129 +124 @@
 class SwitchStmt : public Statement {
   public:
-        SwitchStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &statements );
-        SwitchStmt( const SwitchStmt &other );
+        SwitchStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &branches );
         virtual ~SwitchStmt();
 
@@ -136 +130 @@
         void set_condition( Expression *newValue ) { condition = newValue; }
 
-        std::list<Statement *> & get_statements() { return statements; }
+        std::list<Statement *> & get_branches() { return branches; }
+        void add_case( CaseStmt * );
 
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -145 +140 @@
   private:
         Expression * condition;
-        std::list<Statement *> statements;
+        std::list<Statement *> branches; // should be list of CaseStmt
+};
+
+class ChooseStmt : public Statement {
+  public:
+        ChooseStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &branches );
+        virtual ~ChooseStmt();
+
+        Expression *get_condition() { return condition; }
+        void set_condition( Expression *newValue ) { condition = newValue; }
+
+        std::list<Statement *>& get_branches() { return branches; }
+        void add_case( CaseStmt * );
+
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+
+        virtual ChooseStmt *clone() const { return new ChooseStmt( *this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        Expression *condition;
+        std::list<Statement *> branches; // should be list of CaseStmt
+};
+
+class FallthruStmt : public Statement {
+  public:
+        FallthruStmt( std::list<Label> labels ) : Statement( labels ) { }
+
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+
+        virtual FallthruStmt *clone() const { return new FallthruStmt( *this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
 };
 
 class CaseStmt : public Statement {
   public:
-        CaseStmt( std::list<Label> labels, Expression *conditions, std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
-        CaseStmt( const CaseStmt &other );
+        CaseStmt( std::list<Label> labels, Expression *conditions, 
+              std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
         virtual ~CaseStmt();
 
-        static CaseStmt * makeDefault( std::list<Label> labels = std::list<Label>(), std::list<Statement *> stmts = std::list<Statement *>() );
+        static CaseStmt * makeDefault( std::list<Label> labels = std::list<Label>(),
+                std::list<Statement *> stmts = std::list<Statement *>() );
 
         bool isDefault() const { return _isDefault; }
@@ -164 +192 @@
         std::list<Statement *> &get_statements() { return stmts; }
         void set_statements( std::list<Statement *> &newValue ) { stmts = newValue; }
-
+        
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
@@ -180 +208 @@
         WhileStmt( std::list<Label> labels, Expression *condition,
                Statement *body, bool isDoWhile = false );
-        WhileStmt( const WhileStmt &other );
         virtual ~WhileStmt();
 
@@ -189 +216 @@
         bool get_isDoWhile() { return isDoWhile; }
         void set_isDoWhile( bool newValue ) { isDoWhile = newValue; }
-
+        
         virtual WhileStmt *clone() const { return new WhileStmt( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -204 +231 @@
         ForStmt( std::list<Label> labels, std::list<Statement *> initialization,
              Expression *condition = 0, Expression *increment = 0, Statement *body = 0 );
-        ForStmt( const ForStmt &other );
         virtual ~ForStmt();
 
@@ -215 +241 @@
         Statement *get_body() { return body; }
         void set_body( Statement *newValue ) { body = newValue; }
-
+        
         virtual ForStmt *clone() const { return new ForStmt( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -233 +259 @@
         BranchStmt( std::list<Label> labels, Label target, Type ) throw (SemanticError);
         BranchStmt( std::list<Label> labels, Expression *computedTarget, Type ) throw (SemanticError);
+        virtual ~BranchStmt() {}
 
         Label get_originalTarget() { return originalTarget; }
         Label get_target() { return target; }
         void set_target( Label newValue ) { target = newValue; }
-
+        
         Expression *get_computedTarget() { return computedTarget; }
         void set_target( Expression * newValue ) { computedTarget = newValue; }
@@ -259 +286 @@
   public:
         ReturnStmt( std::list<Label> labels, Expression *expr, bool throwP = false );
-        ReturnStmt( const ReturnStmt &other );
         virtual ~ReturnStmt();
 
         Expression *get_expr() { return expr; }
         void set_expr( Expression *newValue ) { expr = newValue; }
-
+        
         virtual ReturnStmt *clone() const { return new ReturnStmt( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -279 +305 @@
         NullStmt();
         NullStmt( std::list<Label> labels );
+        virtual ~NullStmt();
 
         virtual NullStmt *clone() const { return new NullStmt( *this ); }
@@ -284 +311 @@
         virtual NullStmt *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
-
-  private:
-};
-
-class TryStmt : public Statement {
+        
+  private:
+};
+
+class TryStmt : public Statement { 
   public:
         TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<Statement *> &handlers, FinallyStmt *finallyBlock = 0 );
@@ -305 +332 @@
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
-
+        
   private:
         CompoundStmt *block;
         std::list<Statement *> handlers;
         FinallyStmt *finallyBlock;
-};
+}; 
 
 class CatchStmt : public Statement {
   public:
         CatchStmt( std::list<Label> labels, Declaration *decl, Statement *body, bool isCatchRest = false );
-        CatchStmt( const CatchStmt &other );
         virtual ~CatchStmt();
 
@@ -323 +349 @@
         Statement *get_body() { return body; }
         void set_body( Statement *newValue ) { body = newValue; }
-
+        
         virtual CatchStmt *clone() const { return new CatchStmt( *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;
-
+        
   private:
         Declaration *decl;
@@ -335 +361 @@
 };
 
-class FinallyStmt : public Statement {
+class FinallyStmt : public Statement { 
   public:
         FinallyStmt( std::list<Label> labels, CompoundStmt *block );
-        FinallyStmt( const FinallyStmt &other );
         virtual ~FinallyStmt();
 
         CompoundStmt *get_block() const { return block; }
         void set_block( CompoundStmt *newValue ) { block = newValue; }
-
+        
         virtual FinallyStmt *clone() const { return new FinallyStmt( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -350 +375 @@
   private:
         CompoundStmt *block;
-};
+}; 
 
 
@@ -360 +385 @@
         virtual ~DeclStmt();
 
-        Declaration *get_decl() const { return decl; }
+        Declaration *get_decl() { return decl; }
         void set_decl( Declaration *newValue ) { decl = newValue; }
 
@@ -370 +395 @@
         Declaration *decl;
 };
-
-
-/// represents an implicit application of a constructor or destructor. Qualifiers are replaced
-/// immediately before and after the call so that qualified objects can be constructed
-/// with the same functions as unqualified objects.
-class ImplicitCtorDtorStmt : public Statement {
-  public:
-        ImplicitCtorDtorStmt( Statement * callStmt );
-        ImplicitCtorDtorStmt( const ImplicitCtorDtorStmt & other );
-        virtual ~ImplicitCtorDtorStmt();
-
-        Statement *get_callStmt() const { return callStmt; }
-        void set_callStmt( Statement * newValue ) { callStmt = newValue; }
-
-        virtual ImplicitCtorDtorStmt *clone() const { return new ImplicitCtorDtorStmt( *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;
-
-  private:
-        // Non-owned pointer to the constructor/destructor statement
-        Statement * callStmt;
-};
-
-
-std::ostream & operator<<( std::ostream & out, Statement * statement );
 
 #endif // STATEMENT_H