Changeset bd46af4

Timestamp:

Aug 14, 2017, 10:46:35 AM (7 years ago)

Author:

Andrew Beach <ajbeach@…>

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:

406a6e6, 8217e8f

Parents:

f6cc2096

Message:

Added linkage to more declarations, the remaining aggragates.

Location:

src

Files:

• Parser/TypeData.cc (modified) (5 diffs)
• Parser/TypeData.h (modified) (2 diffs)
• SynTree/Declaration.h (modified) (2 diffs)

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 11 10:50:00 2017
-// Update Count     : 567
+// Last Modified On : Mon Aug 14 10:41:00 2017
+// Update Count     : 568
 //
 
@@ -628 +628 @@
                 break;
           case DeclarationNode::Union:
-                at = new UnionDecl( *td->aggregate.name, attributes );
+                at = new UnionDecl( *td->aggregate.name, attributes, linkage );
                 buildForall( td->aggregate.params, at->get_parameters() );
                 break;
           case DeclarationNode::Trait:
-                at = new TraitDecl( *td->aggregate.name, attributes );
+                at = new TraitDecl( *td->aggregate.name, attributes, linkage );
                 buildList( td->aggregate.params, at->get_parameters() );
                 break;
@@ -649 +649 @@
           case TypeData::Enum: {
                   if ( type->enumeration.body ) {
-                          EnumDecl * typedecl = buildEnum( type, attributes );
+                          EnumDecl * typedecl = buildEnum( type, attributes, linkage );
                           return new EnumInstType( buildQualifiers( type ), typedecl );
                   } else {
@@ -754 +754 @@
 } // buildSymbolic
 
-EnumDecl * buildEnum( const TypeData * td, std::list< Attribute * > attributes ) {
+EnumDecl * buildEnum( const TypeData * td, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ) {
         assert( td->kind == TypeData::Enum );
-        EnumDecl * ret = new EnumDecl( *td->enumeration.name, attributes );
+        EnumDecl * ret = new EnumDecl( *td->enumeration.name, attributes, linkage );
         buildList( td->enumeration.constants, ret->get_members() );
         list< Declaration * >::iterator members = ret->get_members().begin();
@@ -807 +807 @@
                 return buildAggregate( td, attributes, linkage );
         } else if ( td->kind == TypeData::Enum ) {
-                return buildEnum( td, attributes );
+                return buildEnum( td, attributes, linkage );
         } else if ( td->kind == TypeData::Symbolic ) {
                 return buildSymbolic( td, name, scs, linkage );

src/Parser/TypeData.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:18:36 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:32:47 2017
-// Update Count     : 188
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Aug 14 10:38:00 2017
+// Update Count     : 189
 //
 
@@ -107 +107 @@
 ReferenceToType * buildAggInst( const TypeData * );
 TypeDecl * buildVariable( const TypeData * );
-EnumDecl * buildEnum( const TypeData *, std::list< Attribute * > );
+EnumDecl * buildEnum( const TypeData *, std::list< Attribute * >, LinkageSpec::Spec );
 TypeInstType * buildSymbolicInst( const TypeData * );
 TupleType * buildTuple( const TypeData * );

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 11 10:20:00 2017
-// Update Count     : 127
+// Last Modified On : Mon Aug 14 10:15:00 2017
+// Update Count     : 128
 //
 
@@ -313 +313 @@
         typedef AggregateDecl Parent;
   public:
-        TraitDecl( const std::string &name, const std::list< Attribute * > & attributes ) : Parent( name ) {
+        TraitDecl( const std::string &name, const std::list< Attribute * > & attributes, LinkageSpec::Spec linkage ) : Parent( name, attributes, linkage ) {
                 assertf( attributes.empty(), "attribute unsupported for traits" );
         }