Changeset b29f8f3 for src/SynTree/Statement.h

Timestamp:

Jul 29, 2015, 12:07:38 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

093f1a0

Parents:

1e8f143 (diff), 51b986f (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 from origin

File:

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

src/SynTree/Statement.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jun 23 11:44:27 2015
-// Update Count     : 20
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jul 14 12:14:54 2015
+// Update Count     : 24
 //
 
@@ -199 +199 @@
 class ForStmt : public Statement {
   public:
-        ForStmt( std::list<Label> labels, Statement *initialization = 0,
+        ForStmt( std::list<Label> labels, std::list<Statement *> initialization,
              Expression *condition = 0, Expression *increment = 0, Statement *body = 0 );
         virtual ~ForStmt();
 
-        Statement *get_initialization() { return initialization; }
-        void set_initialization( Statement *newValue ) { initialization = newValue; }
+        std::list<Statement *> &get_initialization() { return initialization; }
+        void set_initialization( std::list<Statement *> newValue ) { initialization = newValue; }
         Expression *get_condition() { return condition; }
         void set_condition( Expression *newValue ) { condition = newValue; }
@@ -217 +217 @@
         virtual void print( std::ostream &os, int indent = 0 ) const;
   private:
-        Statement *initialization;
+        std::list<Statement *> initialization;
         Expression *condition;
         Expression *increment;