Changeset b1e63ac5 for src/Parser/TypeData.cc

Timestamp:

Jul 4, 2017, 9:40:16 AM (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:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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 references

File:

• src/Parser/TypeData.cc (modified) (8 diffs)

src/Parser/TypeData.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:12:51 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 15:52:43 2017
-// Update Count     : 563
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 28 15:28:00 2017
+// Update Count     : 564
 //
 
@@ -630 +630 @@
 } // buildReference
 
-AggregateDecl * buildAggregate( const TypeData * td, std::list< Attribute * > attributes ) {
+AggregateDecl * buildAggregate( const TypeData * td, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ) {
         assert( td->kind == TypeData::Aggregate );
         AggregateDecl * at;
@@ -638 +638 @@
           case DeclarationNode::Monitor:
           case DeclarationNode::Thread:
-                at = new StructDecl( *td->aggregate.name, td->aggregate.kind, attributes );
+                at = new StructDecl( *td->aggregate.name, td->aggregate.kind, attributes, linkage );
                 buildForall( td->aggregate.params, at->get_parameters() );
                 break;
@@ -659 +659 @@
 } // buildAggregate
 
-ReferenceToType * buildComAggInst( const TypeData * type, std::list< Attribute * > attributes ) {
+ReferenceToType * buildComAggInst( const TypeData * type, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ) {
         switch ( type->kind ) {
           case TypeData::Enum: {
@@ -672 +672 @@
                   ReferenceToType * ret;
                   if ( type->aggregate.body ) {
-                          AggregateDecl * typedecl = buildAggregate( type, attributes );
+                          AggregateDecl * typedecl = buildAggregate( type, attributes, linkage );
                           switch ( type->aggregate.kind ) {
                                 case DeclarationNode::Struct:
@@ -776 +776 @@
                 if ( cur->has_enumeratorValue() ) {
                         ObjectDecl * member = dynamic_cast< ObjectDecl * >(* members);
-                        member->set_init( new SingleInit( maybeMoveBuild< Expression >( cur->consume_enumeratorValue() ), list< Expression * >() ) );
+                        member->set_init( new SingleInit( maybeMoveBuild< Expression >( cur->consume_enumeratorValue() ) ) );
                 } // if
         } // for
@@ -793 +793 @@
 TupleType * buildTuple( const TypeData * td ) {
         assert( td->kind == TypeData::Tuple );
-        TupleType * ret = new TupleType( buildQualifiers( td ) );
-        buildTypeList( td->tuple, ret->get_types() );
+        std::list< Type * > types;
+        buildTypeList( td->tuple, types );
+        TupleType * ret = new TupleType( buildQualifiers( td ), types );
         buildForall( td->forall, ret->get_forall() );
         return ret;
@@ -818 +819 @@
                 return decl->set_asmName( asmName );
         } else if ( td->kind == TypeData::Aggregate ) {
-                return buildAggregate( td, attributes );
+                return buildAggregate( td, attributes, linkage );
         } else if ( td->kind == TypeData::Enum ) {
                 return buildEnum( td, attributes );