Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision 71bd8c643a0b33dbf0524e863716e19b32478cfd)
+++ src/CodeGen/CodeGenerator.cc	(revision 1ab4ce20f0a6002bb1250a1874430c69854abef8)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 26 16:52:58 2015
-// Update Count     : 144
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 15 14:47:42 2015
+// Update Count     : 177
 //
 
@@ -38,5 +38,5 @@
 	int CodeGenerator::tabsize = 4;
 
-	// the kinds of statements that would ideally be separated by more whitespace
+	// the kinds of statements that would ideally be followed by whitespace
 	bool wantSpacing( Statement * stmt) {
 		return dynamic_cast< IfStmt * >( stmt ) || dynamic_cast< CompoundStmt * >( stmt ) ||
@@ -588,11 +588,8 @@
 
 	void CodeGenerator::visit( ForStmt *forStmt ) {
-		output << "for (";
-
-		if ( forStmt->get_initialization() != 0 )
-			forStmt->get_initialization()->accept( *this );
-		else
-			output << ";";
-		
+		// initialization is always hoisted, so don't 
+		// bother doing anything with that 
+		output << "for (;";
+
 		if ( forStmt->get_condition() != 0 )
 			forStmt->get_condition()->accept( *this );