Changes in src/Parser/InitializerNode.cc [faddbd8:e4d829b]

File:

• src/Parser/InitializerNode.cc (modified) (1 diff)

src/Parser/InitializerNode.cc

@@ -74 +74 @@
 
         InitializerNode *moreInit;
-        if  ( get_next() != 0 && ((moreInit = dynamic_cast< InitializerNode * >( get_next() ) ) != 0) )
+        if ( (moreInit = dynamic_cast< InitializerNode * >( get_next() ) ) ) {
                 moreInit->printOneLine( os );
+        }
 }
 
 Initializer *InitializerNode::build() const {
         if ( aggregate ) {
+                // steal designators from children
+                std::list< Designation * > designlist;
+                InitializerNode * child = next_init();
+                for ( ; child != nullptr; child = dynamic_cast< InitializerNode * >( child->get_next() ) ) {
+                        std::list< Expression * > desList;
+                        buildList< Expression, ExpressionNode >( child->designator, desList );
+                        designlist.push_back( new Designation( desList ) );
+                } // for
                 std::list< Initializer * > initlist;
                 buildList< Initializer, InitializerNode >( next_init(), initlist );
-
-                std::list< Expression * > designlist;
-
-                if ( designator != 0 ) {
-                        buildList< Expression, ExpressionNode >( designator, designlist );
-                } // if
-
                 return new ListInit( initlist, designlist, maybeConstructed );
         } else {
-                std::list< Expression * > designators;
-
-                if ( designator != 0 )
-                        buildList< Expression, ExpressionNode >( designator, designators );
-
-                if ( get_expression() != 0)
-                        return new SingleInit( maybeBuild< Expression >( get_expression() ), designators, maybeConstructed );
+                if ( get_expression() != 0) {
+                        return new SingleInit( maybeBuild< Expression >( get_expression() ), maybeConstructed );
+                }
         } // if
-
         return 0;
 }