Changeset 66f8528 for src/Parser/DeclarationNode.cc

Timestamp:

Dec 15, 2016, 5:16:42 PM (9 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:

43385ca, f7ff3fb

Parents:

5802a4f (diff), 596f987b (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 tuples

Conflicts:

src/ResolvExpr/CommonType.cc
src/tests/.expect/32/extension.txt
src/tests/.expect/32/gccExtensions.txt
src/tests/.expect/64/declarationSpecifier.txt
src/tests/.expect/64/extension.txt
src/tests/.expect/64/gccExtensions.txt
src/tests/.expect/castError.txt
src/tests/Makefile.am

File:

• src/Parser/DeclarationNode.cc (modified) (8 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 : Mon Oct  3 18:03:08 2016
-// Update Count     : 651
+// Last Modified On : Tue Dec 13 14:43:38 2016
+// Update Count     : 660
 //
 
@@ -48 +48 @@
                 type( nullptr ),
                 storageClass( NoStorageClass ),
+                bitfieldWidth( nullptr ),
                 isInline( false ),
                 isNoreturn( false ),
-                bitfieldWidth( nullptr ),
-                initializer( nullptr ),
                 hasEllipsis( false ),
                 linkage( ::linkage ),
+                asmName( nullptr ),
+                initializer( nullptr ),
                 extension( false ) {
 
@@ -75 +76 @@
         delete type;
         delete bitfieldWidth;
+        // asmName, no delete, passed to next stage
         delete initializer;
 }
@@ -90 +92 @@
         newnode->set_next( maybeClone( get_next() ) );
         newnode->linkage = linkage;
+        newnode->asmName = maybeClone( asmName );
 
 //      newnode->variable.name = variable.name ? new string( *variable.name ) : nullptr;
@@ -283 +286 @@
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = nullptr;
-        assert( ! newnode->name ); 
+        assert( ! newnode->name );
 //      newnode->variable.name = name;
         newnode->name = name;
@@ -372 +375 @@
         newnode->type = new TypeData( TypeData::Builtin );
         newnode->builtin = bt;
+        newnode->type->builtintype = newnode->builtin;
         return newnode;
 } // DeclarationNode::newBuiltinType
@@ -640 +644 @@
 }
 
+DeclarationNode * DeclarationNode::addAsmName( ConstantExpr * newname ) {
+        assert( ! asmName );
+        asmName = newname;
+        return this;
+}
+
 DeclarationNode * DeclarationNode::addBitfield( ExpressionNode * size ) {
         bitfieldWidth = size;
@@ -946 +956 @@
 
         if ( type ) {
-                return buildDecl( type, name ? *name : string( "" ), storageClass, maybeBuild< Expression >( bitfieldWidth ), isInline, isNoreturn, linkage, maybeBuild< Initializer >(initializer) )->set_extension( extension );
+                return buildDecl( type, name ? *name : string( "" ), storageClass, maybeBuild< Expression >( bitfieldWidth ), isInline, isNoreturn, linkage, asmName, maybeBuild< Initializer >(initializer) )->set_extension( extension );
         } // if
 
         if ( ! isInline && ! isNoreturn ) {
                 assertf( name, "ObjectDecl are assumed to have names\n" );
-                return (new ObjectDecl( *name, storageClass, linkage, maybeBuild< Expression >( bitfieldWidth ), nullptr, maybeBuild< Initializer >( initializer ) ))->set_extension( extension );
+                return (new ObjectDecl( *name, storageClass, linkage, maybeBuild< Expression >( bitfieldWidth ), nullptr, maybeBuild< Initializer >( initializer ) ))->set_asmName( asmName )->set_extension( extension );
         } // if