Changeset fe26fbf for src/Parser/TypeData.cc

Timestamp:

Feb 7, 2017, 1:01:34 PM (7 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/Parser/TypeData.cc (modified) (4 diffs)

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jan 13 15:47:37 2017
-// Update Count     : 423
+// Last Modified On : Fri Jan 27 15:28:56 2017
+// Update Count     : 428
 //
 
@@ -617 +617 @@
 } // buildPointer
 
-AggregateDecl * buildAggregate( const TypeData * td ) {
+AggregateDecl * buildAggregate( const TypeData * td, std::list< Attribute * > attributes ) {
         assert( td->kind == TypeData::Aggregate );
         AggregateDecl * at;
         switch ( td->aggregate.kind ) {
           case DeclarationNode::Struct:
-                at = new StructDecl( *td->aggregate.name );
+                at = new StructDecl( *td->aggregate.name, attributes );
                 buildForall( td->aggregate.params, at->get_parameters() );
                 break;
           case DeclarationNode::Union:
-                at = new UnionDecl( *td->aggregate.name );
+                at = new UnionDecl( *td->aggregate.name, attributes );
                 buildForall( td->aggregate.params, at->get_parameters() );
                 break;
           case DeclarationNode::Trait:
-                at = new TraitDecl( *td->aggregate.name );
+                at = new TraitDecl( *td->aggregate.name, attributes );
                 buildList( td->aggregate.params, at->get_parameters() );
                 break;
@@ -685 +685 @@
 } // buildSymbolic
 
-EnumDecl * buildEnum( const TypeData * td ) {
+EnumDecl * buildEnum( const TypeData * td, std::list< Attribute * > attributes ) {
         assert( td->kind == TypeData::Enum );
-        EnumDecl * ret = new EnumDecl( *td->enumeration.name );
+        EnumDecl * ret = new EnumDecl( *td->enumeration.name, attributes );
         buildList( td->enumeration.constants, ret->get_members() );
         list< Declaration * >::iterator members = ret->get_members().begin();
@@ -746 +746 @@
                 return decl->set_asmName( asmName );
         } else if ( td->kind == TypeData::Aggregate ) {
-                return buildAggregate( td );
+                return buildAggregate( td, attributes );
         } else if ( td->kind == TypeData::Enum ) {
-                return buildEnum( td );
+                return buildEnum( td, attributes );
         } else if ( td->kind == TypeData::Symbolic ) {
                 return buildSymbolic( td, name, sc );
         } else {
-                return (new ObjectDecl( name, sc, linkage, bitfieldWidth, typebuild( td ), init, list< Attribute * >(), isInline, isNoreturn ))->set_asmName( asmName );
+                return (new ObjectDecl( name, sc, linkage, bitfieldWidth, typebuild( td ), init, attributes, isInline, isNoreturn ))->set_asmName( asmName );
         } // if
         return nullptr;