Changes in src/SynTree/FunctionDecl.cc [03e5d14:7baed7d]

File:

• src/SynTree/FunctionDecl.cc (modified) (7 diffs)

src/SynTree/FunctionDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 06 15:41:05 2016
+// Last Modified On : Fri May 06 15:59:48 2016
 // Update Count     : 19
 //
@@ -19 +19 @@
 #include "Statement.h"
 #include "Type.h"
+#include "Attribute.h"
 #include "Common/utility.h"
 
-FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, Attribute attribute )
-                : Parent( name, sc, linkage ), type( type ), statements( statements ), attribute( attribute ) {
+FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, std::list< Attribute * > attributes )
+                : Parent( name, sc, linkage ), type( type ), statements( statements ), attributes( attributes ) {
         set_isInline( isInline );
         set_isNoreturn( isNoreturn );
@@ -32 +33 @@
 
 FunctionDecl::FunctionDecl( const FunctionDecl &other )
-        : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ), attribute( other.attribute ) {
+        : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
+                cloneAll( other.attributes, attributes );
 }
 
@@ -38 +40 @@
         delete type;
         delete statements;
+        deleteAll( attributes );
 }
 
@@ -65 +68 @@
                 os << "_Noreturn ";
         } // if
-        switch ( attribute.type ) {
-                case Attribute::Constructor:
-                        os << "Global Constructor ";
-                        break;
-                case Attribute::Destructor:
-                        os << "Global Destructor ";
-                        break;
-                default:
-                        break;
-        }
-        if ( attribute.priority != Attribute::Default ) {
-                os << "with priority " << attribute.priority << " ";
-        }
+
+        printAll( attributes, os, indent );
+
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
                 os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
@@ -100 +93 @@
         if ( statements ) {
                 os << string( indent + 2, ' ' ) << "with body " << endl;
+                os << string( indent + 4, ' ' );
                 statements->print( os, indent + 4 );
         } // if
@@ -117 +111 @@
                 os << "_Noreturn ";
         } // if
-        switch ( attribute.type ) {
-                case Attribute::Constructor:
-                        os << " Global Constructor ";
-                        break;
-                case Attribute::Destructor:
-                        os << " Global Destructor ";
-                        break;
-                default:
-                        break;
-        }
-        if ( attribute.priority != Attribute::Default ) {
-                os << "with priority " << attribute.priority << " ";
-        }
+
+        // xxx - should printShort print attributes?
+
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
                 os << DeclarationNode::storageName[ get_storageClass() ] << ' ';