Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision d60ccbfdb9d0e8350271d71c85681a0b22f666df)
+++ src/CodeGen/CodeGenerator.cc	(revision f32c7f45fa64c0eb15a00f117c4f3b9ca2e0ba9e)
@@ -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 : Mon Jul 27 14:40:06 2015
-// Update Count     : 218
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 12 14:33:52 2015
+// Update Count     : 222
 //
 
@@ -190,21 +190,13 @@
 		if ( designators.size() == 0 ) return;
 		for ( DesignatorList::iterator iter = designators.begin(); iter != designators.end(); ++iter ) {
-			// if expression is a name, then initializing aggregate member, if constant expression then array
 			if ( NameExpr * nm = dynamic_cast< NameExpr * >( *iter ) ) {
-				if ( nm->get_name() == "0" || nm->get_name() == "1" ) {
-					// except if name is 0 or 1...
-					output << "[";
-					nm->accept( *this );
-					output << "]";
-				} else {
-					output << ".";
-					nm->accept( *this );
-				}
-			} else if ( dynamic_cast< ConstantExpr * >( *iter ) ) {
+				// if expression is a name, then initializing aggregate member
+				output << ".";
+				(*iter)->accept( *this );
+			} else {
+				// if not a simple name, it has to be a constant expression, i.e. an array designator
 				output << "[";
 				(*iter)->accept( *this );
 				output << "]";
-			} else {
-				assert(0);
 			}
 		}