Changeset eba74ba for src/Parser/DeclarationNode.cc

Timestamp:

May 25, 2018, 2:51:06 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

cdc4d43

Parents:

3ef35bd (diff), 58e822a (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/DeclarationNode.cc (modified) (7 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 16 09:37:17 2018
-// Update Count     : 1070
+// Last Modified On : Tue May 22 08:39:29 2018
+// Update Count     : 1074
 //
 
@@ -32 +32 @@
 #include "SynTree/Type.h"          // for Type, Type::StorageClasses, Type::...
 #include "TypeData.h"              // for TypeData, TypeData::Aggregate_t
-#include "TypedefTable.h"          // for TypedefTable, TypedefTable::kind_t...
+#include "TypedefTable.h"          // for TypedefTable
 
 class Initializer;
@@ -54 +54 @@
 
 DeclarationNode::DeclarationNode() :
+                builtin( NoBuiltinType ),
                 type( nullptr ),
                 bitfieldWidth( nullptr ),
@@ -100 +101 @@
         newnode->name = name ? new string( *name ) : nullptr;
 
+        newnode->builtin = NoBuiltinType;
         newnode->type = maybeClone( type );
         newnode->storageClasses = storageClasses;
@@ -178 +180 @@
         newnode->type->function.body = body;
 
-        // ignore unnamed routine declarations: void p( int (*)(int) );
-        if ( newnode->name ) {
-                typedefTable.addToEnclosingScope( *newnode->name, TypedefTable::ID );
-        } // if
-
         if ( ret ) {
                 newnode->type->base = ret->type;
@@ -284 +281 @@
         newnode->name = name;
         newnode->enumeratorValue.reset( constant );
-        typedefTable.addToEnclosingScope( *newnode->name, TypedefTable::ID );
         return newnode;
 } // DeclarationNode::newEnumConstant
@@ -550 +546 @@
                                         type->aggregate.params = q->type->forall; // make polymorphic type
                                         // change implicit typedef from TYPEDEFname to TYPEGENname
-                                        typedefTable.changeKind( *type->aggregate.name, TypedefTable::TG );
+                                        typedefTable.changeKind( *type->aggregate.name, TYPEGENname );
                                 } // if
                         } else {                                                                        // not polymorphic