Changeset 3f7e12cb for src/SynTree/AggregateDecl.cc

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, 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:

954908d

Parents:

78315272 (diff), e35f30a (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/SynTree/AggregateDecl.cc

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