Changeset 31ce3d6 for src/Parser/TypeData.cc

Timestamp:

Mar 20, 2017, 3:20:34 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

e04b636

Parents:

7c70089 (diff), 6e8f1df (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:software/cfa/cfa-cc

File:

• src/Parser/TypeData.cc (modified) (5 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 Mar 17 08:46:10 2017
-// Update Count     : 560
+// Last Modified On : Fri Mar 17 15:52:43 2017
+// Update Count     : 563
 //
 
@@ -619 +619 @@
         switch ( td->aggregate.kind ) {
           case DeclarationNode::Struct:
-                at = new StructDecl( *td->aggregate.name, attributes );
+          case DeclarationNode::Coroutine:
+          case DeclarationNode::Monitor:
+          case DeclarationNode::Thread:
+                at = new StructDecl( *td->aggregate.name, td->aggregate.kind, attributes );
                 buildForall( td->aggregate.params, at->get_parameters() );
                 break;
@@ -656 +659 @@
                           switch ( type->aggregate.kind ) {
                                 case DeclarationNode::Struct:
+                                case DeclarationNode::Coroutine:
+                                case DeclarationNode::Monitor:
+                                case DeclarationNode::Thread:
                                   ret = new StructInstType( buildQualifiers( type ), (StructDecl *)typedecl );
                                   break;
@@ -671 +677 @@
                           switch ( type->aggregate.kind ) {
                                 case DeclarationNode::Struct:
+                                case DeclarationNode::Coroutine:
+                                case DeclarationNode::Monitor:
+                                case DeclarationNode::Thread:
                                   ret = new StructInstType( buildQualifiers( type ), *type->aggregate.name );
                                   break;
@@ -703 +712 @@
                   switch ( type->aggregate.kind ) {
                         case DeclarationNode::Struct:
+                        case DeclarationNode::Coroutine:
+                        case DeclarationNode::Monitor:
+                        case DeclarationNode::Thread:
                           ret = new StructInstType( buildQualifiers( type ), *type->aggregate.name );
                           break;