Changes in src/SynTree/Statement.h [ba3706f:61255ad]

File:

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

src/SynTree/Statement.h

@@ -37 +37 @@
         std::list<Label> labels;
 
-        Statement( const std::list<Label> & labels = {} );
+        Statement( std::list<Label> labels );
         virtual ~Statement();
 
@@ -53 +53 @@
         std::list<Statement*> kids;
 
-        CompoundStmt();
+        CompoundStmt( std::list<Label> labels );
         CompoundStmt( std::list<Statement *> stmts );
         CompoundStmt( const CompoundStmt &other );
@@ -70 +70 @@
 class NullStmt : public Statement {
   public:
-        NullStmt( const std::list<Label> & labels = {} );
+        NullStmt();
+        NullStmt( std::list<Label> labels );
 
         virtual NullStmt *clone() const override { return new NullStmt( *this ); }
@@ -82 +83 @@
         Expression *expr;
 
-        ExprStmt( Expression *expr );
+        ExprStmt( std::list<Label> labels, Expression *expr );
         ExprStmt( const ExprStmt &other );
         virtual ~ExprStmt();
@@ -103 +104 @@
         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( 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( const AsmStmt &other );
         virtual ~AsmStmt();
@@ -133 +134 @@
         std::list<Statement *> initialization;
 
-        IfStmt( Expression *condition, Statement *thenPart, Statement *elsePart,
+        IfStmt( std::list<Label> labels, Expression *condition, Statement *thenPart, Statement *elsePart,
                         std::list<Statement *> initialization = std::list<Statement *>() );
         IfStmt( const IfStmt &other );
@@ -157 +158 @@
         std::list<Statement *> statements;
 
-        SwitchStmt( Expression *condition, const std::list<Statement *> &statements );
+        SwitchStmt( std::list<Label> labels, Expression *condition, const std::list<Statement *> &statements );
         SwitchStmt( const SwitchStmt &other );
         virtual ~SwitchStmt();
@@ -179 +180 @@
         std::list<Statement *> stmts;
 
-        CaseStmt( Expression *conditions, const std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
+        CaseStmt( std::list<Label> labels, Expression *conditions, const std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
         CaseStmt( const CaseStmt &other );
         virtual ~CaseStmt();
 
-        static CaseStmt * makeDefault( const std::list<Label> & labels = {}, 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; }
@@ -209 +210 @@
         bool isDoWhile;
 
-        WhileStmt( Expression *condition,
+        WhileStmt( std::list<Label> labels, Expression *condition,
                Statement *body, bool isDoWhile = false );
         WhileStmt( const WhileStmt &other );
@@ -234 +235 @@
         Statement *body;
 
-        ForStmt( std::list<Statement *> initialization,
+        ForStmt( std::list<Label> labels, std::list<Statement *> initialization,
              Expression *condition = 0, Expression *increment = 0, Statement *body = 0 );
         ForStmt( const ForStmt &other );
@@ -263 +264 @@
         Type type;
 
-        BranchStmt( Label target, Type ) throw (SemanticError);
-        BranchStmt( Expression *computedTarget, Type ) throw (SemanticError);
+        BranchStmt( std::list<Label> labels, Label target, Type ) throw (SemanticError);
+        BranchStmt( std::list<Label> labels, Expression *computedTarget, Type ) throw (SemanticError);
 
         Label get_originalTarget() { return originalTarget; }
@@ -288 +289 @@
         Expression *expr;
 
-        ReturnStmt( Expression *expr );
+        ReturnStmt( std::list<Label> labels, Expression *expr );
         ReturnStmt( const ReturnStmt &other );
         virtual ~ReturnStmt();
@@ -309 +310 @@
         Expression * target;
 
-        ThrowStmt( Kind kind, Expression * expr, Expression * target = nullptr );
+        ThrowStmt( std::list<Label> labels, Kind kind, Expression * expr, Expression * target = nullptr );
         ThrowStmt( const ThrowStmt &other );
         virtual ~ThrowStmt();
@@ -331 +332 @@
         FinallyStmt * finallyBlock;
 
-        TryStmt( CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock = 0 );
+        TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock = 0 );
         TryStmt( const TryStmt &other );
         virtual ~TryStmt();
@@ -357 +358 @@
         Statement *body;
 
-        CatchStmt( Kind kind, Declaration *decl,
+        CatchStmt( std::list<Label> labels, Kind kind, Declaration *decl,
                    Expression *cond, Statement *body );
         CatchStmt( const CatchStmt &other );
@@ -380 +381 @@
         CompoundStmt *block;
 
-        FinallyStmt( CompoundStmt *block );
+        FinallyStmt( std::list<Label> labels, CompoundStmt *block );
         FinallyStmt( const FinallyStmt &other );
         virtual ~FinallyStmt();
@@ -407 +408 @@
         };
 
-        WaitForStmt();
+        WaitForStmt( std::list<Label> labels = noLabels );
         WaitForStmt( const WaitForStmt & );
         virtual ~WaitForStmt();
@@ -431 +432 @@
 };
 
+class WithStmt : public Statement {
+public:
+        std::list< Expression * > exprs;
+        Statement * stmt;
+
+        WithStmt( const std::list< Expression * > & exprs, Statement * stmt );
+        WithStmt( const WithStmt & other );
+        virtual ~WithStmt();
+
+        virtual WithStmt * clone() const override { return new WithStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
+
 
 // represents a declaration that occurs as part of a compound statement
@@ -437 +453 @@
         Declaration *decl;
 
-        DeclStmt( Declaration *decl );
+        DeclStmt( std::list<Label> labels, Declaration *decl );
         DeclStmt( const DeclStmt &other );
         virtual ~DeclStmt();