Changeset 7baed7d for src/SynTree

Timestamp:

Jun 6, 2016, 5:46:09 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

64a32c6

Parents:

64071c2

Message:

generalize notion of a GCC attribute

Location:

src/SynTree

Files:

• Declaration.h (modified) (3 diffs)
• FunctionDecl.cc (modified) (5 diffs)
• SynTree.h (modified) (1 diff)
• module.mk (modified) (2 diffs)

src/SynTree/Declaration.h

@@ -115 +115 @@
         typedef DeclarationWithType Parent;
   public:
-        // temporary - merge this into general GCC attributes
-        struct Attribute {
-                enum Type {
-                        NoAttribute, Constructor, Destructor,
-                } type;
-                enum Priority {
-                        // priorities 0-100 are reserved by gcc, so it's okay to use 100 an exceptional case
-                        Default = 100, High,
-                } priority;
-                Attribute(Type t = NoAttribute, Priority p = Default) : type(t), priority(p) {};
-        };
-
-        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, Attribute attribute = Attribute() );
+        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, const std::list< Attribute * > attributes = std::list< Attribute * >() );
         FunctionDecl( const FunctionDecl &other );
         virtual ~FunctionDecl();
@@ -140 +128 @@
         std::list< std::string >& get_oldIdents() { return oldIdents; }
         std::list< Declaration* >& get_oldDecls() { return oldDecls; }
-        Attribute get_attribute() const { return attribute; }
-        void set_attribute( Attribute newValue ) { attribute = newValue; }
+        std::list< Attribute * >& get_attributes() { return attributes; }
 
         virtual FunctionDecl *clone() const { return new FunctionDecl( *this ); }
@@ -153 +140 @@
         std::list< std::string > oldIdents;
         std::list< Declaration* > oldDecls;
-        Attribute attribute;
+        std::list< Attribute * > attributes;
 };
 

src/SynTree/FunctionDecl.cc

@@ -19 +19 @@
 #include "Statement.h"
 #include "Type.h"
+#include "Attribute.h"
 #include "Common/utility.h"
 
-FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, Attribute attribute )
-                : Parent( name, sc, linkage ), type( type ), statements( statements ), attribute( attribute ) {
+FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, std::list< Attribute * > attributes )
+                : Parent( name, sc, linkage ), type( type ), statements( statements ), attributes( attributes ) {
         set_isInline( isInline );
         set_isNoreturn( isNoreturn );
@@ -32 +33 @@
 
 FunctionDecl::FunctionDecl( const FunctionDecl &other )
-        : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ), attribute( other.attribute ) {
+        : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
+                cloneAll( other.attributes, attributes );
 }
 
@@ -38 +40 @@
         delete type;
         delete statements;
+        deleteAll( attributes );
 }
 
@@ -65 +68 @@
                 os << "_Noreturn ";
         } // if
-        switch ( attribute.type ) {
-                case Attribute::Constructor:
-                        os << "Global Constructor ";
-                        break;
-                case Attribute::Destructor:
-                        os << "Global Destructor ";
-                        break;
-                default:
-                        break;
-        }
-        if ( attribute.priority != Attribute::Default ) {
-                os << "with priority " << attribute.priority << " ";
-        }
+
+        printAll( attributes, os, indent );
+
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
                 os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
@@ -118 +111 @@
                 os << "_Noreturn ";
         } // if
-        switch ( attribute.type ) {
-                case Attribute::Constructor:
-                        os << " Global Constructor ";
-                        break;
-                case Attribute::Destructor:
-                        os << " Global Destructor ";
-                        break;
-                default:
-                        break;
-        }
-        if ( attribute.priority != Attribute::Default ) {
-                os << "with priority " << attribute.priority << " ";
-        }
+
+        // xxx - should printShort print attributes?
+
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
                 os << DeclarationNode::storageName[ get_storageClass() ] << ' ';

src/SynTree/SynTree.h

@@ -118 +118 @@
 class TypeSubstitution;
 
+// gcc attribute
+class Attribute;
+
 #endif // SYNTREE_H
 

src/SynTree/module.mk

@@ -6 +6 @@
 ## file "LICENCE" distributed with Cforall.
 ##
-## module.mk -- 
+## module.mk --
 ##
 ## Author           : Richard C. Bilson
@@ -46 +46 @@
        SynTree/Visitor.cc \
        SynTree/Mutator.cc \
-       SynTree/TypeSubstitution.cc
+       SynTree/TypeSubstitution.cc \
+       SynTree/Attribute.cc