Changes in src/SynTree/AggregateDecl.cc [50377a4:ea6332d]

File:

• src/SynTree/AggregateDecl.cc (modified) (1 diff)

src/SynTree/AggregateDecl.cc

@@ -41 +41 @@
 }
 
-void AggregateDecl::print( std::ostream &os, Indenter indent ) const {
+void AggregateDecl::print( std::ostream &os, int indent ) const {
         using std::string;
         using std::endl;
 
-        os << typeString() << " " << name << ":";
+        os << typeString() << " " << get_name() << ":";
         if ( get_linkage() != LinkageSpec::Cforall ) {
-                os << " " << LinkageSpec::linkageName( linkage );
+                os << " " << LinkageSpec::linkageName( get_linkage() );
         } // if
-        os << " with body " << has_body();
+        os << " with body " << has_body() << endl;
 
         if ( ! parameters.empty() ) {
-                os << endl << indent << "... with parameters" << endl;
-                printAll( parameters, os, indent+1 );
+                os << endl << string( indent+2, ' ' ) << "with parameters" << endl;
+                printAll( parameters, os, indent+4 );
         } // if
         if ( ! members.empty() ) {
-                os << endl << indent << "... with members" << endl;
-                printAll( members, os, indent+1 );
+                os << endl << string( indent+2, ' ' ) << "with members" << endl;
+                printAll( members, os, indent+4 );
         } // if
         if ( ! attributes.empty() ) {
-                os << endl << indent << "... with attributes" << endl;
-                printAll( attributes, os, indent+1 );
+                os << endl << string( indent+2, ' ' ) << "with attributes" << endl;
+                printAll( attributes, os, indent+4 );
         } // if
-        os << endl;
 }
 
-void AggregateDecl::printShort( std::ostream &os, Indenter indent ) const {
+void AggregateDecl::printShort( std::ostream &os, int indent ) const {
         using std::string;
         using std::endl;
 
-        os << typeString() << " " << name << " with body " << has_body() << endl;
+        os << typeString() << " " << get_name();
+        os << string( indent+2, ' ' ) << "with body " << has_body() << endl;
 
         if ( ! parameters.empty() ) {
-                os << indent << "... with parameters" << endl;
-                printAll( parameters, os, indent+1 );
+                os << endl << string( indent+2, ' ' ) << "with parameters" << endl;
+                printAll( parameters, os, indent+4 );
         } // if
 }