Changeset 04cdd9b for src/Parser/InitializerNode.cc

Timestamp:

Aug 19, 2016, 2:42:04 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

e85a8631

Parents:

03da511 (diff), ac71a86 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ctor

File:

• src/Parser/InitializerNode.cc (modified) (6 diffs)

src/Parser/InitializerNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:20:24 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul  4 15:37:15 2016
-// Update Count     : 15
+// Last Modified On : Mon Aug 15 18:27:02 2016
+// Update Count     : 20
 //
 
@@ -25 +25 @@
         : expr( _expr ), aggregate( aggrp ), designator( des ), kids( 0 ), maybeConstructed( true ) {
         if ( aggrp )
-                kids = dynamic_cast< InitializerNode *>( get_link() );
+                kids = dynamic_cast< InitializerNode * >( get_next() );
 
         if ( kids != 0 )
-                set_link( 0 );
+                set_last( 0 );
 }
 
@@ -34 +34 @@
         : expr( 0 ), aggregate( aggrp ), designator( des ), kids( 0 ), maybeConstructed( true ) {
         if ( init != 0 )
-                set_link(init);
+                set_last( init );
 
         if ( aggrp )
-                kids = dynamic_cast< InitializerNode *>( get_link() );
+                kids = dynamic_cast< InitializerNode * >( get_next() );
 
         if ( kids != 0 )
@@ -58 +58 @@
                         while ( curdes != 0) {
                                 curdes->printOneLine(os);
-                                curdes = (ExpressionNode *)(curdes->get_link());
+                                curdes = (ExpressionNode *)(curdes->get_next());
                                 if ( curdes ) os << ", ";
                         } // while
@@ -72 +72 @@
 
         InitializerNode *moreInit;
-        if  ( get_link() != 0 && ((moreInit = dynamic_cast< InitializerNode * >( get_link() ) ) != 0) )
+        if  ( get_next() != 0 && ((moreInit = dynamic_cast< InitializerNode * >( get_next() ) ) != 0) )
                 moreInit->printOneLine( os );
 }
@@ -82 +82 @@
                 //assert( next_init() != 0 );
 
-                std::list< Initializer *> initlist;
-                buildList<Initializer, InitializerNode>( next_init(), initlist );
+                std::list< Initializer * > initlist;
+                buildList< Initializer, InitializerNode >( next_init(), initlist );
 
-                std::list< Expression *> designlist;
+                std::list< Expression * > designlist;
 
                 if ( designator != 0 ) {
-                        buildList<Expression, ExpressionNode>( designator, designlist );
+                        buildList< Expression, ExpressionNode >( designator, designlist );
                 } // if
 
                 return new ListInit( initlist, designlist, maybeConstructed );
         } else {
-                std::list< Expression *> designators;
+                std::list< Expression * > designators;
 
                 if ( designator != 0 )
-                        buildList<Expression, ExpressionNode>( designator, designators );
+                        buildList< Expression, ExpressionNode >( designator, designators );
 
                 if ( get_expression() != 0)
-                        return new SingleInit( maybeBuild<Expression>( get_expression() ), designators, maybeConstructed );
+                        return new SingleInit( maybeBuild< Expression >( get_expression() ), designators, maybeConstructed );
         } // if