Changeset 4a3386b4 for src/Parser/DeclarationNode.cc

Timestamp:

Jan 19, 2017, 2:56:51 PM (9 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:

8f49a54

Parents:

765aa76 (diff), c2416d5 (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/DeclarationNode.cc (modified) (5 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 : Tue Dec 13 14:43:38 2016
-// Update Count     : 660
+// Last Modified On : Sat Jan 14 14:36:23 2017
+// Update Count     : 669
 //
 
@@ -22 +22 @@
 #include "TypeData.h"
 
+#include "SynTree/Attribute.h"
 #include "SynTree/Declaration.h"
 #include "SynTree/Expression.h"
@@ -397 +398 @@
 }
 
+DeclarationNode * DeclarationNode::newAttribute( string * name, ExpressionNode * expr ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->type = nullptr;
+        std::list< Expression * > exprs;
+        buildList( expr, exprs );
+        newnode->attributes.push_back( new Attribute( *name, exprs ) );
+        delete name;
+        return newnode;
+}
+
 void appendError( string & dst, const string & src ) {
         if ( src.empty() ) return;
@@ -435 +446 @@
                 storageClass = q->storageClass;
         } // if
+        attributes.splice( attributes.end(), q->attributes );
         return this;
 } // DeclarationNode::copyStorageClasses
@@ -958 +970 @@
 
         if ( type ) {
-                return buildDecl( type, name ? *name : string( "" ), storageClass, maybeBuild< Expression >( bitfieldWidth ), isInline, isNoreturn, linkage, asmName, maybeBuild< Initializer >(initializer) )->set_extension( extension );
+                return buildDecl( type, name ? *name : string( "" ), storageClass, maybeBuild< Expression >( bitfieldWidth ), isInline, isNoreturn, linkage, asmName, maybeBuild< Initializer >(initializer), attributes )->set_extension( extension );
         } // if