Changeset c331406 for src/SynTree/Statement.h

Timestamp:

Aug 5, 2016, 11:03:04 AM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

a2f920f

Parents:

5070fe4 (diff), 1b0020a (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 changes from master

File:

• src/SynTree/Statement.h (modified) (4 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 : Tue Jul 12 17:53:29 2016
-// Update Count     : 47
+// Last Modified On : Thu Aug  4 11:26:02 2016
+// Update Count     : 64
 //
 
@@ -129 +129 @@
 class SwitchStmt : public Statement {
   public:
-        SwitchStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &branches );
+        SwitchStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &statements );
         SwitchStmt( const SwitchStmt &other );
         virtual ~SwitchStmt();
@@ -136 +136 @@
         void set_condition( Expression *newValue ) { condition = newValue; }
 
-        std::list<Statement *> & get_branches() { return branches; }
-        void add_case( CaseStmt * );
+        std::list<Statement *> & get_statements() { return statements; }
 
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -146 +145 @@
   private:
         Expression * condition;
-        std::list<Statement *> branches; // should be list of CaseStmt
+        std::list<Statement *> statements;
 };
 
 class CaseStmt : public Statement {
   public:
-        CaseStmt( std::list<Label> labels, Expression *conditions,
-              std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
+        CaseStmt( std::list<Label> labels, Expression *conditions, std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
         CaseStmt( const CaseStmt &other );
         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; }