Changeset f80e0218 for src/SynTree/FunctionDecl.cc

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

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

src/SynTree/FunctionDecl.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FunctionDecl.cc -- 
+// FunctionDecl.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 13 18:11:44 2015
+// Last Modified By : Rob Schluntz
+// 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 )
-                : Parent( name, sc, linkage ), type( type ), statements( statements ) {
+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 );
@@ -33 +34 @@
 FunctionDecl::FunctionDecl( const FunctionDecl &other )
         : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
+                cloneAll( other.attributes, attributes );
 }
 
@@ -38 +40 @@
         delete type;
         delete statements;
+        deleteAll( attributes );
 }
 
@@ -52 +55 @@
         using std::endl;
         using std::string;
-        
+
         if ( get_name() != "" ) {
                 os << get_name() << ": ";
@@ -65 +68 @@
                 os << "_Noreturn ";
         } // if
+
+        printAll( attributes, os, indent );
+
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
                 os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
@@ -87 +93 @@
         if ( statements ) {
                 os << string( indent + 2, ' ' ) << "with body " << endl;
+                os << string( indent + 4, ' ' );
                 statements->print( os, indent + 4 );
         } // if
@@ -94 +101 @@
         using std::endl;
         using std::string;
-        
+
         if ( get_name() != "" ) {
                 os << get_name() << ": ";
@@ -104 +111 @@
                 os << "_Noreturn ";
         } // if
+
+        // xxx - should printShort print attributes?
+
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
                 os << DeclarationNode::storageName[ get_storageClass() ] << ' ';