Changeset 90152a4 for src/SynTree/Statement.h

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

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 Mar  8 14:53:02 2018
+// Update Count     : 78
 //
 
@@ -126 +126 @@
 };
 
+class DirectiveStmt : public Statement {
+        public:
+        std::string directive;
+
+        DirectiveStmt( const std::string & );
+        virtual ~DirectiveStmt(){}
+
+        virtual DirectiveStmt * clone() const { return new DirectiveStmt( *this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+};
+
 class IfStmt : public Statement {
   public:
@@ -179 +192 @@
         std::list<Statement *> stmts;
 
-        CaseStmt( Expression *conditions, const std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
+        CaseStmt( Expression *conditions, const std::list<Statement *> &stmts, bool isdef = false ) throw (SemanticErrorException);
         CaseStmt( const CaseStmt &other );
         virtual ~CaseStmt();
@@ -207 +220 @@
         Expression *condition;
         Statement *body;
+        std::list<Statement *> initialization;
         bool isDoWhile;
 
         WhileStmt( Expression *condition,
-               Statement *body, bool isDoWhile = false );
+               Statement *body, std::list<Statement *> & initialization, bool isDoWhile = false );
         WhileStmt( const WhileStmt &other );
         virtual ~WhileStmt();
@@ -255 +269 @@
 class BranchStmt : public Statement {
   public:
-        enum Type { Goto = 0, Break, Continue };
+        enum Type { Goto = 0, Break, Continue, FallThrough, FallThroughDefault };
 
         // originalTarget kept for error messages.
@@ -263 +277 @@
         Type type;
 
-        BranchStmt( Label target, Type ) throw (SemanticError);
-        BranchStmt( Expression *computedTarget, Type ) throw (SemanticError);
+        BranchStmt( Label target, Type ) throw (SemanticErrorException);
+        BranchStmt( Expression *computedTarget, Type ) throw (SemanticErrorException);
 
         Label get_originalTarget() { return originalTarget; }