Changeset 724c2b6 for src/SynTree

Timestamp:

Jul 15, 2015, 4:47:48 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

1db21619

Parents:

9163b9c (diff), 1ab4ce2 (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 'resolver'

Location:

src/SynTree

Files:

• Mutator.cc (modified) (2 diffs)
• Statement.cc (modified) (3 diffs)
• Statement.h (modified) (3 diffs)
• Visitor.cc (modified) (2 diffs)

src/SynTree/Mutator.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 May 18 10:10:46 2015
-// Update Count     : 1
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jul 14 12:31:39 2015
+// Update Count     : 2
 //
 
@@ -109 +109 @@
 
 Statement *Mutator::mutate( ForStmt *forStmt ) {
-        forStmt->set_initialization( maybeMutate( forStmt->get_initialization(), *this ) );
+        mutateAll( forStmt->get_initialization(), *this );
         forStmt->set_condition( maybeMutate( forStmt->get_condition(), *this ) );
         forStmt->set_increment( maybeMutate( forStmt->get_increment(), *this ) );

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"; 

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;

src/SynTree/Visitor.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 May 18 11:14:51 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jul 14 12:31:03 2015
+// Update Count     : 3
 //
 
@@ -94 +94 @@
 
 void Visitor::visit( ForStmt *forStmt ) {
-        // ForStmt still needs to be fixed
-        maybeAccept( forStmt->get_initialization(), *this );
+        acceptAll( forStmt->get_initialization(), *this );
         maybeAccept( forStmt->get_condition(), *this );
         maybeAccept( forStmt->get_increment(), *this );