Changes in src/SynTree/Declaration.h [3a5131ed:a7c90d4]

File:

• src/SynTree/Declaration.h (modified) (12 diffs)

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 14:53:35 2017
-// Update Count     : 57
+// Last Modified On : Tue Mar  7 07:40:42 2017
+// Update Count     : 113
 //
 
@@ -28 +28 @@
 class Declaration : public BaseSyntaxNode {
   public:
-        Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage );
+        Declaration( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage );
         Declaration( const Declaration &other );
         virtual ~Declaration();
@@ -34 +34 @@
         const std::string &get_name() const { return name; }
         void set_name( std::string newValue ) { name = newValue; }
-        DeclarationNode::StorageClass get_storageClass() const { return storageClass; }
-        void set_storageClass( DeclarationNode::StorageClass newValue ) { storageClass = newValue; }
+
+        DeclarationNode::StorageClasses get_storageClasses() const { return storageClasses; }
+
         LinkageSpec::Spec get_linkage() const { return linkage; }
         void set_linkage( LinkageSpec::Spec newValue ) { linkage = newValue; }
-        bool get_isInline() const { return isInline; }
-        void set_isInline( bool newValue ) { isInline = newValue; }
-        bool get_isNoreturn() const { return isNoreturn; }
-        void set_isNoreturn( bool newValue ) { isNoreturn = newValue; }
+
         UniqueId get_uniqueId() const { return uniqueId; }
+
         bool get_extension() const { return extension; }
         Declaration *set_extension( bool exten ) { extension = exten; return this; }
@@ -57 +56 @@
   private:
         std::string name;
-        DeclarationNode::StorageClass storageClass;
+        DeclarationNode::StorageClasses storageClasses;
         LinkageSpec::Spec linkage;
-        bool isInline, isNoreturn;
         UniqueId uniqueId;
         bool extension = false;
@@ -66 +64 @@
 class DeclarationWithType : public Declaration {
   public:
-        DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes );
+        DeclarationWithType( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, DeclarationNode::FuncSpecifiers fs );
         DeclarationWithType( const DeclarationWithType &other );
         virtual ~DeclarationWithType();
@@ -83 +81 @@
         std::list< Attribute * >& get_attributes() { return attributes; }
         const std::list< Attribute * >& get_attributes() const { return attributes; }
+
+        DeclarationNode::FuncSpecifiers get_funcSpec() const { return fs; }
+        //void set_functionSpecifiers( DeclarationNode::FuncSpecifiers newValue ) { fs = newValue; }
 
         virtual DeclarationWithType *clone() const = 0;
@@ -97 +98 @@
         ConstantExpr *asmName;
         std::list< Attribute * > attributes;
+        DeclarationNode::FuncSpecifiers fs;
 };
 
@@ -102 +104 @@
         typedef DeclarationWithType Parent;
   public:
-        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes = std::list< Attribute * >(), bool isInline = false, bool isNoreturn = false );
+        ObjectDecl( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init,
+                                const std::list< Attribute * > attributes = std::list< Attribute * >(), DeclarationNode::FuncSpecifiers fs = DeclarationNode::FuncSpecifiers() );
         ObjectDecl( const ObjectDecl &other );
         virtual ~ObjectDecl();
@@ -129 +132 @@
         typedef DeclarationWithType Parent;
   public:
-        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, const std::list< Attribute * > attributes = std::list< Attribute * >() );
+        FunctionDecl( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements,
+                                  const std::list< Attribute * > attributes = std::list< Attribute * >(), DeclarationNode::FuncSpecifiers fs = DeclarationNode::FuncSpecifiers() );
         FunctionDecl( const FunctionDecl &other );
         virtual ~FunctionDecl();
@@ -154 +158 @@
         typedef Declaration Parent;
   public:
-        NamedTypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type );
+        NamedTypeDecl( const std::string &name, DeclarationNode::StorageClasses scs, Type *type );
         NamedTypeDecl( const NamedTypeDecl &other );
         virtual ~NamedTypeDecl();
@@ -189 +193 @@
         };
 
-        TypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type, Kind kind );
+        TypeDecl( const std::string &name, DeclarationNode::StorageClasses scs, Type *type, Kind kind );
         TypeDecl( const TypeDecl &other );
 
@@ -210 +214 @@
         typedef NamedTypeDecl Parent;
   public:
-        TypedefDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type ) : Parent( name, sc, type ) {}
+        TypedefDecl( const std::string &name, DeclarationNode::StorageClasses scs, Type *type ) : Parent( name, scs, type ) {}
         TypedefDecl( const TypedefDecl &other ) : Parent( other ) {}