Changeset 6840e7c for src/SynTree/FunctionDecl.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/FunctionDecl.cc (modified) (2 diffs)

src/SynTree/FunctionDecl.cc

@@ -63 +63 @@
 }
 
-void FunctionDecl::print( std::ostream &os, int indent ) const {
+void FunctionDecl::print( std::ostream &os, Indenter indent ) const {
         using std::endl;
         using std::string;
 
-        if ( get_name() != "" ) {
-                os << get_name() << ": ";
+        if ( name != "" ) {
+                os << name << ": ";
         } // if
-        if ( get_linkage() != LinkageSpec::Cforall ) {
-                os << LinkageSpec::linkageName( get_linkage() ) << " ";
+        if ( linkage != LinkageSpec::Cforall ) {
+                os << LinkageSpec::linkageName( linkage ) << " ";
         } // if
 
-        printAll( get_attributes(), os, indent );
+        printAll( attributes, os, indent );
 
         get_storageClasses().print( os );
         get_funcSpec().print( os );
 
-        if ( get_type() ) {
-                get_type()->print( os, indent );
+        if ( type ) {
+                type->print( os, indent );
         } else {
                 os << "untyped entity ";
@@ -86 +86 @@
 
         if ( statements ) {
-                os << string( indent + 2, ' ' ) << "with body " << endl;
-                os << string( indent + 4, ' ' );
-                statements->print( os, indent + 4 );
+                os << indent << "... with body " << endl << indent+1;
+                statements->print( os, indent+1 );
         } // if
 }
 
-void FunctionDecl::printShort( std::ostream &os, int indent ) const {
+void FunctionDecl::printShort( std::ostream &os, Indenter indent ) const {
         using std::endl;
         using std::string;
 
-        if ( get_name() != "" ) {
-                os << get_name() << ": ";
+        if ( name != "" ) {
+                os << name << ": ";
         } // if
-
-        // xxx - should printShort print attributes?
 
         get_storageClasses().print( os );
         get_funcSpec().print( os );
 
-        if ( get_type() ) {
-                get_type()->print( os, indent );
+        if ( type ) {
+                type->print( os, indent );
         } else {
                 os << "untyped entity ";