Changes in src/SynTree/ObjectDecl.cc [50377a4:93389c1]

File:

• src/SynTree/ObjectDecl.cc (modified) (3 diffs)

src/SynTree/ObjectDecl.cc

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