Index: src/Parser/StatementNode.cc
===================================================================
--- src/Parser/StatementNode.cc	(revision 71bd8c643a0b33dbf0524e863716e19b32478cfd)
+++ src/Parser/StatementNode.cc	(revision 145f1fc837f3fe2237a52a1c4d10dfa54a209da5)
@@ -9,7 +9,7 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 14:59:41 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun  6 23:25:41 2015
-// Update Count     : 19
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jul 14 12:20:44 2015
+// Update Count     : 21
 //
 
@@ -271,7 +271,8 @@
 			assert( ctl != 0 );
 
-			Statement *stmt = 0;
-			if ( ctl->get_init() != 0 )
-				stmt = ctl->get_init()->build();
+			std::list<Statement *> init;
+			if ( ctl->get_init() != 0 ) {
+				buildList( ctl->get_init(), init );
+			}
 
 			Expression *cond = 0;
@@ -283,5 +284,5 @@
 				incr = ctl->get_change()->build();
 
-			return new ForStmt( labs, stmt, cond, incr, branches.front() );
+			return new ForStmt( labs, init, cond, incr, branches.front() );
 		}
 	  case Switch: