Changeset 3f80888 for src/SynTree/ObjectDecl.cc

Timestamp:

Mar 6, 2017, 2:07:04 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

2988eeb

Parents:

df47e2f (diff), d107010 (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 : Fri Mar  3 20:59:27 2017
+// Update Count     : 45
 //
 
@@ -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::StorageClass sc, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, DeclarationNode::FuncSpec fs )
+        : Parent( name, sc, linkage, attributes, fs ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
+        set_functionSpecifiers( fs );
 }
 
@@ -50 +49 @@
 
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
+                os << DeclarationNode::storageClassNames[ get_storageClass() ] << ' ';
         } // if
 
@@ -86 +85 @@
 
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
+                os << DeclarationNode::storageClassNames[ get_storageClass() ] << ' ';
         } // if