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

src/SynTree/ObjectDecl.cc

@@ -44 +44 @@
 }
 
-void ObjectDecl::print( std::ostream &os, int indent ) const {
-        if ( get_name() != "" ) {
-                os << get_name() << ": ";
+void ObjectDecl::print( std::ostream &os, Indenter indent ) const {
+        if ( name != "" ) os << name << ": ";
+
+        if ( linkage != LinkageSpec::Cforall ) {
+                os << LinkageSpec::linkageName( linkage ) << " ";
         } // if
-
-        if ( get_linkage() != LinkageSpec::Cforall ) {
-                os << LinkageSpec::linkageName( get_linkage() ) << " ";
-        } // if
-
-        printAll( get_attributes(), os, indent );
 
         get_storageClasses().print( os );
 
-        if ( get_type() ) {
-                get_type()->print( os, indent );
+        if ( type ) {
+                type->print( os, indent );
         } else {
                 os << " untyped entity ";
@@ -64 +60 @@
 
         if ( init ) {
-                os << " with initializer " << std::endl;
-                init->print( os, indent+2 );
-                os << std::endl << std::string(indent+2, ' ');
-                os << "maybeConstructed? " << init->get_maybeConstructed();
+                os << " with initializer (" << (init->get_maybeConstructed() ? "maybe constructed" : "not constructed") << ")" << std::endl << indent+1;
+                init->print( os, indent+1 );
+                os << std::endl;
         } // if
 
+        if ( ! attributes.empty() ) {
+                os << std::endl << indent << "... with attributes: " << std::endl;
+                printAll( attributes, os, indent+1 );
+        }
+
         if ( bitfieldWidth ) {
-                os << std::string(indent, ' ');
-                os << " with bitfield width ";
+                os << indent << " with bitfield width ";
                 bitfieldWidth->print( os );
         } // if
 }
 
-void ObjectDecl::printShort( std::ostream &os, int indent ) const {
+void ObjectDecl::printShort( std::ostream &os, Indenter indent ) const {
 #if 0
         if ( get_mangleName() != "") {
@@ -83 +82 @@
         } else
 #endif
-        if ( get_name() != "" ) {
-                os << get_name() << ": ";
-        } // if
-
-        // xxx - should printShort print attributes?
+        if ( name != "" ) os << name << ": ";
 
         get_storageClasses().print( os );
 
-        if ( get_type() ) {
-                get_type()->print( os, indent );
+        if ( type ) {
+                type->print( os, indent );
         } else {
                 os << "untyped entity ";