Changes in src/SynTree/Initializer.cc [50377a4:d67cdb7]

File:

• src/SynTree/Initializer.cc (modified) (4 diffs)

src/SynTree/Initializer.cc

@@ -38 +38 @@
 }
 
-void Designation::print( std::ostream &os, Indenter indent ) const {
+void Designation::print( std::ostream &os, int indent ) const {
         if ( ! designators.empty() ) {
-                os << "... designated by: " << std::endl;
-                for ( const Expression * d : designators ) {
-                        os << indent+1;
-                        d->print(os, indent+1 );
-                        os << std::endl;
+                os << std::string(indent + 2, ' ' ) << "designated by: " << std::endl;
+                for ( std::list < Expression * >::const_iterator i = designators.begin(); i != designators.end(); i++ ) {
+                        os << std::string(indent + 4, ' ' );
+                        ( *i )->print(os, indent + 4 );
                 }
+                os << std::endl;
         } // if
 }
@@ -64 +64 @@
 }
 
-void SingleInit::print( std::ostream &os, Indenter indent ) const {
-        os << "Simple Initializer: ";
-        value->print( os, indent );
+void SingleInit::print( std::ostream &os, int indent ) const {
+        os << std::string(indent, ' ' ) << "Simple Initializer: " << std::endl;
+        os << std::string(indent+4, ' ' );
+        value->print( os, indent+4 );
 }
 
@@ -92 +93 @@
 }
 
-void ListInit::print( std::ostream &os, Indenter indent ) const {
-        os << "Compound initializer: " << std::endl;
-        for ( auto p : group_iterate( designations, initializers ) ) {
-                const Designation * d = std::get<0>(p);
-                const Initializer * init = std::get<1>(p);
-                os << indent+1;
-                init->print( os, indent+1 );
+void ListInit::print( std::ostream &os, int indent ) const {
+        os << std::string(indent, ' ') << "Compound initializer:  " << std::endl;
+        for ( Designation * d : designations ) {
+                d->print( os, indent + 2 );
+        }
+
+        for ( const Initializer * init : initializers ) {
+                init->print( os, indent + 2 );
                 os << std::endl;
-                if ( ! d->designators.empty() ) {
-                        os << indent+1;
-                        d->print( os, indent+1 );
-                }
         }
 }
@@ -118 +116 @@
 }
 
-void ConstructorInit::print( std::ostream &os, Indenter indent ) const {
-        os << "Constructor initializer: " << std::endl;
+void ConstructorInit::print( std::ostream &os, int indent ) const {
+        os << std::endl << std::string(indent, ' ') << "Constructor initializer: " << std::endl;
         if ( ctor ) {
-                os << indent << "... initially constructed with ";
-                ctor->print( os, indent+1 );
+                os << std::string(indent+2, ' ');
+                os << "initially constructed with ";
+                ctor->print( os, indent+4 );
         } // if
 
         if ( dtor ) {
-                os << indent << "... destructed with ";
-                dtor->print( os, indent+1 );
+                os << std::string(indent+2, ' ');
+                os << "destructed with ";
+                dtor->print( os, indent+4 );
         }
 
         if ( init ) {
-                os << indent << "... with fallback C-style initializer: ";
-                init->print( os, indent+1 );
+                os << std::string(indent+2, ' ');
+                os << "with fallback C-style initializer: ";
+                init->print( os, indent+4 );
         }
 }