Changeset 4a7d895 for src/Parser/InitializerNode.cc

Timestamp:

Aug 20, 2016, 5:33:07 AM (9 years ago)

Author:

Aaron Moss <bruceiv@…>

Branches:

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

Children:

80722d0

Parents:

7b1bfc5 (diff), 2037f82 (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' of plg2.cs.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/InitializerNode.cc (modified) (4 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 : Sat Aug 13 18:55:11 2016
-// Update Count     : 18
+// 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_next() );
+                kids = dynamic_cast< InitializerNode * >( get_next() );
 
         if ( kids != 0 )
@@ -37 +37 @@
 
         if ( aggrp )
-                kids = dynamic_cast< InitializerNode *>( get_next() );
+                kids = dynamic_cast< InitializerNode * >( get_next() );
 
         if ( kids != 0 )
@@ -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