Changeset be8bd88 for src/SynTree/ObjectDecl.cc

Timestamp:

Mar 8, 2017, 3:22:50 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

031a2c95, 0e7ea335

Parents:

87c3bef (diff), 6363ad1 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/SynTree/ObjectDecl.cc (modified) (4 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 : Sat Oct  1 23:05:56 2016
-// Update Count     : 32
+// Last Modified On : Tue Mar  7 07:55:24 2017
+// Update Count     : 54
 //
 
@@ -22 +22 @@
 #include "Statement.h"
 
-ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, bool isInline, bool isNoreturn )
-        : Parent( name, sc, linkage, attributes ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
-        set_isInline( isInline );
-        set_isNoreturn( isNoreturn );
+ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, DeclarationNode::FuncSpecifiers fs )
+        : Parent( name, scs, linkage, attributes, fs ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
 }
 
@@ -49 +47 @@
         printAll( get_attributes(), os, indent );
 
-        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
-        } // if
+        DeclarationNode::print_StorageClass( os, get_storageClasses() );
 
         if ( get_type() ) {
@@ -85 +81 @@
         // xxx - should printShort print attributes?
 
-        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
-        } // if
+        DeclarationNode::print_StorageClass( os, get_storageClasses() );
 
         if ( get_type() ) {