Changeset 0720e049 for src/Parser/TypeData.cc

Timestamp:

Aug 11, 2017, 10:33:37 AM (8 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:

54cd58b0

Parents:

3d4b23fa (diff), 59a75cb (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) (8 diffs)

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jun 28 15:28:00 2017
-// Update Count     : 564
+// Last Modified On : Wed Aug  9 13:50:00 2017
+// Update Count     : 567
 //
 
@@ -63 +63 @@
                 aggregate.fields = nullptr;
                 aggregate.body = false;
+                aggregate.tagged = false;
+                aggregate.parent = nullptr;
                 break;
           case AggregateInst:
@@ -121 +123 @@
                 delete aggregate.actuals;
                 delete aggregate.fields;
+                delete aggregate.parent;
                 // delete aggregate;
                 break;
@@ -192 +195 @@
                 newtype->aggregate.kind = aggregate.kind;
                 newtype->aggregate.body = aggregate.body;
+                newtype->aggregate.tagged = aggregate.tagged;
+                newtype->aggregate.parent = aggregate.parent ? new string( *aggregate.parent ) : nullptr;
                 break;
           case AggregateInst:
@@ -449 +454 @@
           case TypeData::Builtin:
                 if(td->builtintype == DeclarationNode::Zero) {
-                        return new ZeroType( emptyQualifiers );
+                        return new ZeroType( noQualifiers );
                 }
                 else if(td->builtintype == DeclarationNode::One) {
-                        return new OneType( emptyQualifiers );
+                        return new OneType( noQualifiers );
                 }
                 else {
@@ -619 +624 @@
         switch ( td->aggregate.kind ) {
           case DeclarationNode::Struct:
+                if ( td->aggregate.tagged ) {
+                        at = new StructDecl( *td->aggregate.name, td->aggregate.parent, attributes, linkage );
+                        buildForall( td->aggregate.params, at->get_parameters() );
+                        break;
+                }
           case DeclarationNode::Coroutine:
           case DeclarationNode::Monitor:
@@ -738 +748 @@
 } // buildAggInst
 
-NamedTypeDecl * buildSymbolic( const TypeData * td, const string & name, Type::StorageClasses scs ) {
+NamedTypeDecl * buildSymbolic( const TypeData * td, const string & name, Type::StorageClasses scs, LinkageSpec::Spec linkage ) {
         assert( td->kind == TypeData::Symbolic );
         NamedTypeDecl * ret;
         assert( td->base );
         if ( td->symbolic.isTypedef ) {
-                ret = new TypedefDecl( name, scs, typebuild( td->base ) );
+                ret = new TypedefDecl( name, scs, typebuild( td->base ), linkage );
         } else {
                 ret = new TypeDecl( name, scs, typebuild( td->base ), TypeDecl::Any );
@@ -807 +817 @@
                 return buildEnum( td, attributes );
         } else if ( td->kind == TypeData::Symbolic ) {
-                return buildSymbolic( td, name, scs );
+                return buildSymbolic( td, name, scs, linkage );
         } else {
                 return (new ObjectDecl( name, scs, linkage, bitfieldWidth, typebuild( td ), init, attributes ))->set_asmName( asmName );