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

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 : Tue Mar  7 07:40:42 2017
-// Update Count     : 113
+// Last Modified On : Thu Mar 16 08:34:11 2017
+// Update Count     : 118
 //
 
@@ -28 +28 @@
 class Declaration : public BaseSyntaxNode {
   public:
-        Declaration( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage );
+        Declaration( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage );
         Declaration( const Declaration &other );
         virtual ~Declaration();
@@ -35 +35 @@
         void set_name( std::string newValue ) { name = newValue; }
 
-        DeclarationNode::StorageClasses get_storageClasses() const { return storageClasses; }
+        Type::StorageClasses get_storageClasses() const { return storageClasses; }
 
         LinkageSpec::Spec get_linkage() const { return linkage; }
@@ -56 +56 @@
   private:
         std::string name;
-        DeclarationNode::StorageClasses storageClasses;
+        Type::StorageClasses storageClasses;
         LinkageSpec::Spec linkage;
         UniqueId uniqueId;
@@ -64 +64 @@
 class DeclarationWithType : public Declaration {
   public:
-        DeclarationWithType( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, DeclarationNode::FuncSpecifiers fs );
+        DeclarationWithType( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, Type::FuncSpecifiers fs );
         DeclarationWithType( const DeclarationWithType &other );
         virtual ~DeclarationWithType();
@@ -82 +82 @@
         const std::list< Attribute * >& get_attributes() const { return attributes; }
 
-        DeclarationNode::FuncSpecifiers get_funcSpec() const { return fs; }
-        //void set_functionSpecifiers( DeclarationNode::FuncSpecifiers newValue ) { fs = newValue; }
+        Type::FuncSpecifiers get_funcSpec() const { return fs; }
+        //void set_functionSpecifiers( Type::FuncSpecifiers newValue ) { fs = newValue; }
 
         virtual DeclarationWithType *clone() const = 0;
@@ -98 +98 @@
         ConstantExpr *asmName;
         std::list< Attribute * > attributes;
-        DeclarationNode::FuncSpecifiers fs;
+        Type::FuncSpecifiers fs;
 };
 
@@ -104 +104 @@
         typedef DeclarationWithType Parent;
   public:
-        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 std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init,
+                                const std::list< Attribute * > attributes = std::list< Attribute * >(), Type::FuncSpecifiers fs = Type::FuncSpecifiers() );
         ObjectDecl( const ObjectDecl &other );
         virtual ~ObjectDecl();
@@ -132 +132 @@
         typedef DeclarationWithType Parent;
   public:
-        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 std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements,
+                                  const std::list< Attribute * > attributes = std::list< Attribute * >(), Type::FuncSpecifiers fs = Type::FuncSpecifiers() );
         FunctionDecl( const FunctionDecl &other );
         virtual ~FunctionDecl();
@@ -158 +158 @@
         typedef Declaration Parent;
   public:
-        NamedTypeDecl( const std::string &name, DeclarationNode::StorageClasses scs, Type *type );
+        NamedTypeDecl( const std::string &name, Type::StorageClasses scs, Type *type );
         NamedTypeDecl( const NamedTypeDecl &other );
         virtual ~NamedTypeDecl();
@@ -193 +193 @@
         };
 
-        TypeDecl( const std::string &name, DeclarationNode::StorageClasses scs, Type *type, Kind kind );
+        TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind );
         TypeDecl( const TypeDecl &other );
 
@@ -214 +214 @@
         typedef NamedTypeDecl Parent;
   public:
-        TypedefDecl( const std::string &name, DeclarationNode::StorageClasses scs, Type *type ) : Parent( name, scs, type ) {}
+        TypedefDecl( const std::string &name, Type::StorageClasses scs, Type *type ) : Parent( name, scs, type ) {}
         TypedefDecl( const TypedefDecl &other ) : Parent( other ) {}