Changeset 3848e0e for translator/Parser/InitializerNode.cc

Timestamp:

Dec 3, 2014, 3:08:38 PM (10 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d9a0e76

Parents:

42dcae7

Message:

underscore changes, ptrdiff_t changes, formating, _Bool prelude

File:

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

translator/Parser/InitializerNode.cc

@@ -9 +9 @@
 
 InitializerNode::InitializerNode( ExpressionNode *_expr, bool aggrp, ExpressionNode *des )
-  : expr( _expr ), aggregate( aggrp ), designator( des ), kids( 0 )
-{
-  if ( aggrp )
-    kids = dynamic_cast< InitializerNode *>( get_link() );
+        : expr( _expr ), aggregate( aggrp ), designator( des ), kids( 0 ) {
+    if ( aggrp )
+        kids = dynamic_cast< InitializerNode *>( get_link() );
 
-  if ( kids != 0 )
-    set_link( 0 );
+    if ( kids != 0 )
+        set_link( 0 );
 }
 
 InitializerNode::InitializerNode( InitializerNode *init, bool aggrp, ExpressionNode *des )
-  : aggregate( aggrp ), designator( des ), kids( 0 )
-{
-  if (init != 0)
-    set_link(init);
+        : aggregate( aggrp ), designator( des ), kids( 0 ) {
+    if ( init != 0 )
+        set_link(init);
 
-  if ( aggrp )
-      kids = dynamic_cast< InitializerNode *>( get_link() );
+    if ( aggrp )
+        kids = dynamic_cast< InitializerNode *>( get_link() );
 
-  if ( kids != 0 )
-    set_next( 0 );
+    if ( kids != 0 )
+        set_next( 0 );
 }
 
 InitializerNode::~InitializerNode() {
-  delete expr;
+    delete expr;
 }
 
 void InitializerNode::print( std::ostream &os, int indent ) const {
-  os << std::string(indent, ' ') << "Initializer expression" << std::endl;
+    os << std::string(indent, ' ') << "Initializer expression" << std::endl;
 }
 
 void InitializerNode::printOneLine( std::ostream &os ) const {
-  if (!aggregate)
-    {
-
-      if ( designator != 0 )
-        {
-          os << "designated by: (";
-          ExpressionNode  *curdes = designator;
-          while( curdes != 0){
-            curdes->printOneLine(os);
-            curdes = (ExpressionNode *)(curdes->get_link());
-            if(curdes) os << ", ";
-          }
-          os << ")";
+    if ( ! aggregate ) {
+        if ( designator != 0 ) {
+            os << "designated by: (";
+            ExpressionNode  *curdes = designator;
+            while( curdes != 0) {
+                curdes->printOneLine(os);
+                curdes = (ExpressionNode *)(curdes->get_link());
+                if ( curdes ) os << ", ";
+            }
+            os << ")";
         }
-
-      if (expr) expr->printOneLine(os);
-    }
-  else  // It's an aggregate
-    {
-      os << "[--";
-      if( next_init() != 0 )
-        next_init()->printOneLine(os);
-
-      if (aggregate) os << "--]";
+        if ( expr ) expr->printOneLine(os);
+    } else {  // It's an aggregate
+        os << "[--";
+        if ( next_init() != 0 )
+            next_init()->printOneLine(os);
+        if (aggregate) os << "--]";
     }
 
-  InitializerNode * moreInit;
-  if  ( get_link() != 0 && ((moreInit = dynamic_cast< InitializerNode * >( get_link() ) ) != 0) )
-    moreInit->printOneLine( os );
+    InitializerNode *moreInit;
+    if  ( get_link() != 0 && ((moreInit = dynamic_cast< InitializerNode * >( get_link() ) ) != 0) )
+        moreInit->printOneLine( os );
 }
 
 Initializer *InitializerNode::build() const {
-  // if ( get_expression() == 0 ) return 0;  // XXX (?)
+    // if ( get_expression() == 0 ) return 0;  // XXX (?)
 
-  if ( aggregate )
-    {
-      assert( next_init() != 0 );
+    if ( aggregate ) {
+        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;
-      if ( designator != 0 )
-        buildList<Expression, ExpressionNode>( designator, designlist );
+        std::list< Expression *> designlist;
+        if ( designator != 0 )
+            buildList<Expression, ExpressionNode>( designator, designlist );
 
-      return new ListInit( initlist, designlist );
-    }
-  else
-    {
-      std::list< Expression *> designators;
+        return new ListInit( initlist, designlist );
+    } else {
+        std::list< Expression *> designators;
 
-      if ( designator != 0 )
-        buildList<Expression, ExpressionNode>( designator, designators );
+        if ( designator != 0 )
+            buildList<Expression, ExpressionNode>( designator, designators );
 
-      if ( get_expression() != 0)
-        return new SingleInit( get_expression()->build(), designators );
+        if ( get_expression() != 0)
+            return new SingleInit( get_expression()->build(), designators );
     }
 
-  return 0;
+    return 0;
 }
-
-