Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision ac911f4580af492bfee5703bee473ffc9a388299)
+++ src/CodeGen/CodeGenerator.cc	(revision 3778cb2314fa46ed66e835021dbe5baec0641cfd)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 30 11:27:07 2016
-// Update Count     : 340
+// Last Modified On : Sat Jul 30 14:59:34 2016
+// Update Count     : 341
 //
 
@@ -155,4 +155,5 @@
 			objectDecl->get_init()->accept( *this );
 		} // if
+
 		if ( objectDecl->get_bitfieldWidth() ) {
 			output << ":";
@@ -172,9 +173,9 @@
 
 			cur_indent += CodeGenerator::tabsize;
-			for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
+			for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
 				output << indent;
 				(*i)->accept( *this );
 				output << ";" << endl;
-			}
+			} // for
 
 			cur_indent -= CodeGenerator::tabsize;
@@ -257,6 +258,6 @@
 				(*iter)->accept( *this );
 				output << "]";
-			}
-		}
+			} // if
+		} // for
 		output << " = ";
 	}
@@ -317,5 +318,5 @@
 					// do nothing
 					;
-				}
+				} // switch
 
 				switch ( opInfo.type ) {
@@ -385,5 +386,5 @@
 					// there are no intrinsic definitions of 0/1 or label addresses as functions
 					assert( false );
-				}
+				} // switch
 			} else {
 				varExpr->accept( *this );
@@ -437,5 +438,5 @@
 						// no constructors with 0 or more than 2 parameters
 						assert( false );
-					}
+					} // if
 					break;
 
@@ -470,14 +471,12 @@
 					// there are no intrinsic definitions of 0 or 1 as functions
 					assert( false );
-				}
+				} // switch
 			} else {
-				if ( nameExpr->get_name() != "Range" ) {
-					// builtin routines
+				if ( nameExpr->get_name() != "Range" ) { // builtin routines
 					nameExpr->accept( *this );
 					output << "(";
 					genCommaList( untypedExpr->get_args().begin(), untypedExpr->get_args().end() );
 					output << ")";
-				} else {
-					// case V1 ... V2 or case V1~V2
+				} else {								// case V1 ... V2 or case V1~V2
 					assert( untypedExpr->get_args().size() == 2 );
 					(*untypedExpr->get_args().begin())->accept( *this );
@@ -530,5 +529,5 @@
 			// otherwise, the cast is to an lvalue type, so the cast should be dropped, since the result of a cast is
 			// never an lvalue in C
-		}
+		} // if
 		castExpr->get_arg()->accept( *this );
 		output << ")";
@@ -663,5 +662,5 @@
 			if ( wantSpacing( *i ) ) {
 				output << endl;
-			}
+			} // if
 		}
 		cur_indent -= CodeGenerator::tabsize;
@@ -746,5 +745,5 @@
 			(*i)->accept( *this );
 			output << endl;
-		}
+		} // for
 		cur_indent -= CodeGenerator::tabsize;
 	}
@@ -768,5 +767,5 @@
 			output << "continue";
 			break;
-		}
+		} // switch
 		output << ";";
 	}
@@ -807,5 +806,5 @@
 		if ( forStmt->get_condition() != 0 ) {
 			forStmt->get_condition()->accept( *this );
-		}
+		} // if
 		output << ";";
 
@@ -814,5 +813,5 @@
 			Expression * expr = new CastExpr( forStmt->get_increment() );
 			expr->accept( *this );
-		}
+		} // if
 		output << ") ";