Changeset b29f8f3 for src/SynTree/Statement.cc

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.cc (modified) (3 diffs)

src/SynTree/Statement.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 29 17:37:10 2015
-// Update Count     : 22
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 15 14:57:40 2015
+// Update Count     : 27
 //
 
@@ -192 +192 @@
 }
 
-ForStmt::ForStmt( std::list<Label> labels, Statement *initialization_, Expression *condition_, Expression *increment_, Statement *body_ ):
+ForStmt::ForStmt( std::list<Label> labels, std::list<Statement *> initialization_, Expression *condition_, Expression *increment_, Statement *body_ ):
         Statement( labels ), initialization( initialization_ ), condition( condition_ ), increment( increment_ ), body( body_ ) {
 }
 
 ForStmt::~ForStmt() {
-        delete initialization;
+        deleteAll( initialization );
         delete condition;
         delete increment;
@@ -213 +213 @@
 
         os << string( indent + 2, ' ' ) << "initialization: \n"; 
-        if ( initialization != 0 )
-                initialization->print( os, indent + 4 );
+        for ( std::list<Statement *>::const_iterator it = initialization.begin(); it != initialization.end(); ++it ) {
+                (*it)->print( os, indent + 4 );
+        }
 
         os << "\n" << string( indent + 2, ' ' ) << "condition: \n";