Changes in src/CodeGen/CodeGenerator.cc [62423350:daf1af8]

File:

• src/CodeGen/CodeGenerator.cc (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc

@@ -288 +288 @@
         }
 
-        void CodeGenerator::visit( Designation * designation ) {
-                std::list< Expression * > designators = designation->get_designators();
+        void CodeGenerator::printDesignators( std::list< Expression * > & designators ) {
+                typedef std::list< Expression * > DesignatorList;
                 if ( designators.size() == 0 ) return;
-                for ( Expression * des : designators ) {
-                        if ( dynamic_cast< NameExpr * >( des ) || dynamic_cast< VariableExpr * >( des ) ) {
-                                // if expression is a NameExpr or VariableExpr, then initializing aggregate member
+                for ( DesignatorList::iterator iter = designators.begin(); iter != designators.end(); ++iter ) {
+                        if ( dynamic_cast< NameExpr * >( *iter ) ) {
+                                // if expression is a name, then initializing aggregate member
                                 output << ".";
-                                des->accept( *this );
+                                (*iter)->accept( *this );
                         } else {
-                                // otherwise, it has to be a ConstantExpr or CastExpr, initializing array eleemnt
+                                // if not a simple name, it has to be a constant expression, i.e. an array designator
                                 output << "[";
-                                des->accept( *this );
+                                (*iter)->accept( *this );
                                 output << "]";
                         } // if
@@ -307 +307 @@
 
         void CodeGenerator::visit( SingleInit * init ) {
+                printDesignators( init->get_designators() );
                 init->get_value()->accept( *this );
         }
 
         void CodeGenerator::visit( ListInit * init ) {
-                auto initBegin = init->begin();
-                auto initEnd = init->end();
-                auto desigBegin = init->get_designations().begin();
-                auto desigEnd = init->get_designations().end();
-
+                printDesignators( init->get_designators() );
                 output << "{ ";
-                for ( ; initBegin != initEnd && desigBegin != desigEnd; ) {
-                        (*desigBegin)->accept( *this );
-                        (*initBegin)->accept( *this );
-                        ++initBegin, ++desigBegin;
-                        if ( initBegin != initEnd ) {
-                                output << ", ";
-                        }
-                }
+                genCommaList( init->begin(), init->end() );
                 output << " }";
-                assertf( initBegin == initEnd && desigBegin == desigEnd, "Initializers and designators not the same length. %s", toString( init ).c_str() );
         }
 
@@ -727 +716 @@
 
         void CodeGenerator::visit( TypeExpr * typeExpr ) {
-                // if ( genC ) std::cerr << "typeexpr still exists: " << typeExpr << std::endl;
-                // assertf( ! genC, "TypeExpr should not reach code generation." );
-                if ( ! genC ) {
-                        output<< genType( typeExpr->get_type(), "", pretty, genC );
-                }
+                assertf( ! genC, "TypeExpr should not reach code generation." );
+                output<< genType( typeExpr->get_type(), "", pretty, genC );
         }