Changeset 937e51d for src/SynTree/ObjectDecl.cc

Timestamp:

Jun 26, 2015, 4:00:26 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

0df292b, e0ff3e6

Parents:

eb50842 (diff), 1869adf (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 pointer to pointer to qualified fix into master

File:

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

src/SynTree/ObjectDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 10:14:18 2015
-// Update Count     : 2
+// Last Modified On : Sat Jun 13 08:10:16 2015
+// Update Count     : 15
 //
 
@@ -20 +20 @@
 #include "utility.h"
 
-ObjectDecl::ObjectDecl( const std::string &name, StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init )
+ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init )
         : Parent( name, sc, linkage ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
 }
@@ -36 +36 @@
 void ObjectDecl::print( std::ostream &os, int indent ) const {
         if ( get_name() != "" ) {
-                os << get_name() << ": a ";
+                os << get_name() << ": ";
         } // if
 
@@ -43 +43 @@
         } // if
 
-        if ( get_storageClass() != NoStorageClass ) {
-                os << storageClassName[ get_storageClass() ] << ' ';
+        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
+                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
         } // if
 
@@ -65 +65 @@
 
 void ObjectDecl::printShort( std::ostream &os, int indent ) const {
+#if 0
+        if ( get_mangleName() != "") {
+                os << get_mangleName() << ": "; 
+        } else 
+#endif
         if ( get_name() != "" ) {
-                os << get_name() << ": a ";
+                os << get_name() << ": ";
         } // if
 
-        if ( get_storageClass() != NoStorageClass ) {
-                os << storageClassName[ get_storageClass() ] << ' ';
+        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
+                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
         } // if