Changeset fe26fbf for src/SynTree/AggregateDecl.cc

Timestamp:

Feb 7, 2017, 1:01:34 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

35b1bf4

Parents:

dbe8f244 (diff), b4d65c7 (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:/u/cforall/software/cfa/cfa-cc

File:

• src/SynTree/AggregateDecl.cc (modified) (3 diffs)

src/SynTree/AggregateDecl.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 23:56:39 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 13 18:03:30 2016
-// Update Count     : 10
+// Last Modified On : Mon Feb  6 15:31:23 2017
+// Update Count     : 17
 //
 
 #include "Declaration.h"
+#include "Attribute.h"
 #include "Type.h"
 #include "Common/utility.h"
 
 
-AggregateDecl::AggregateDecl( const std::string &name ) : Parent( name, DeclarationNode::NoStorageClass, LinkageSpec::Cforall ), body( false ) {
+AggregateDecl::AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes ) : Parent( name, DeclarationNode::NoStorageClass, LinkageSpec::Cforall ), body( false ), attributes( attributes ) {
 }
 
@@ -25 +26 @@
         cloneAll( other.members, members );
         cloneAll( other.parameters, parameters );
+        cloneAll( other.attributes, attributes );
         body = other.body;
 }
 
 AggregateDecl::~AggregateDecl() {
+        deleteAll( attributes );
+        deleteAll( parameters );
         deleteAll( members );
-        deleteAll( parameters );
 }
 
@@ -47 +50 @@
                 os << endl << string( indent+2, ' ' ) << "with members" << endl;
                 printAll( members, os, indent+4 );
+        } // if
+        if ( ! attributes.empty() ) {
+                os << endl << string( indent+2, ' ' ) << "with attributes" << endl;
+                printAll( attributes, os, indent+4 );
         } // if
 }