Changeset 6840e7c for src/SynTree/NamedTypeDecl.cc

Timestamp:

Oct 19, 2017, 12:01:04 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

837ce06

Parents:

b96ec83 (diff), a15b72c (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' into cleanup-dtors

File:

• src/SynTree/NamedTypeDecl.cc (modified) (2 diffs)

src/SynTree/NamedTypeDecl.cc

@@ -38 +38 @@
 }
 
-void NamedTypeDecl::print( std::ostream &os, int indent ) const {
+void NamedTypeDecl::print( std::ostream &os, Indenter indent ) const {
         using namespace std;
 
-        if ( get_name() != "" ) {
-                os << get_name() << ": ";
-        } // if
-        if ( get_linkage() != LinkageSpec::Cforall ) {
-                os << LinkageSpec::linkageName( get_linkage() ) << " ";
+        if ( name != "" ) os << name << ": ";
+
+        if ( linkage != LinkageSpec::Cforall ) {
+                os << LinkageSpec::linkageName( linkage ) << " ";
         } // if
         get_storageClasses().print( os );
@@ -51 +50 @@
         if ( base ) {
                 os << " for ";
-                base->print( os, indent );
+                base->print( os, indent+1 );
         } // if
         if ( ! parameters.empty() ) {
-                os << endl << string( indent, ' ' ) << "with parameters" << endl;
-                printAll( parameters, os, indent+2 );
+                os << endl << indent << "... with parameters" << endl;
+                printAll( parameters, os, indent+1 );
         } // if
         if ( ! assertions.empty() ) {
-                os << endl << string( indent, ' ' ) << "with assertions" << endl;
-                printAll( assertions, os, indent+2 );
+                os << endl << indent << "... with assertions" << endl;
+                printAll( assertions, os, indent+1 );
         } // if
 }
 
-void NamedTypeDecl::printShort( std::ostream &os, int indent ) const {
+void NamedTypeDecl::printShort( std::ostream &os, Indenter indent ) const {
         using namespace std;
 
-        if ( get_name() != "" ) {
-                os << get_name() << ": ";
-        } // if
+        if ( name != "" ) os << name << ": ";
         get_storageClasses().print( os );
         os << typeString();
         if ( base ) {
                 os << " for ";
-                base->print( os, indent );
+                base->print( os, indent+1 );
         } // if
         if ( ! parameters.empty() ) {
-                os << endl << string( indent, ' ' ) << "with parameters" << endl;
-                printAll( parameters, os, indent+2 );
+                os << endl << indent << "... with parameters" << endl;
+                printAll( parameters, os, indent+1 );
         } // if
 }