Changeset 1cdfa82 for src/Parser/TypeData.cc

Timestamp:

Apr 25, 2018, 4:55:53 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

42107b4

Parents:

2efe4b8 (diff), 9d5fb67 (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 remote-tracking branch 'origin/master' into with_gc

File:

• src/Parser/TypeData.cc (modified) (3 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 : Thu Feb 22 15:49:00 2018
-// Update Count     : 597
+// Last Modified On : Tue Apr 17 23:00:52 2018
+// Update Count     : 602
 //
 
@@ -395 +395 @@
                 break;
           case Builtin:
-                os << "gcc builtin type";
+                os << DeclarationNode::builtinTypeNames[builtintype];
                 break;
           default:
@@ -490 +490 @@
         switch ( td->kind ) {
           case TypeData::Aggregate:
-                if ( ! toplevel && td->aggregate.fields ) {
+                if ( ! toplevel && td->aggregate.body ) {
                         ret = td->clone();
                 } // if
                 break;
           case TypeData::Enum:
-                if ( ! toplevel && td->enumeration.constants ) {
+                if ( ! toplevel && td->enumeration.body ) {
                         ret = td->clone();
                 } // if