Changes in src/SynTree/Declaration.h [de62360d:843054c2]

File:

• src/SynTree/Declaration.h (modified) (11 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 : Sat Jun 13 09:10:31 2015
-// Update Count     : 25
+// Last Modified On : Mon May 18 08:46:25 2015
+// Update Count     : 2
 //
 
@@ -21 +21 @@
 #include "Mutator.h"
 #include "Parser/LinkageSpec.h"
-#include "Parser/ParseNode.h"
 
 class Declaration {
   public:
-        Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage );
+        enum StorageClass {  
+                NoStorageClass,
+                Extern,
+                Static,
+                Auto,
+                Register,
+                Inline,
+                Fortran,
+        };      
+
+        Declaration( const std::string &name, StorageClass sc, LinkageSpec::Type linkage );
         Declaration( const Declaration &other );
         virtual ~Declaration();
 
-        const std::string &get_name() const { return name; }
+        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; }
+        StorageClass get_storageClass() const { return storageClass; }
+        void set_storageClass( StorageClass newValue ) { storageClass = newValue; }
         LinkageSpec::Type get_linkage() const { return linkage; }
         void set_linkage( LinkageSpec::Type newValue ) { linkage = newValue; }
@@ -44 +53 @@
         virtual void printShort( std::ostream &os, int indent = 0 ) const = 0;
 
+        static const char* storageClassName[];  
+
         static void dumpIds( std::ostream &os );
         static Declaration *declFromId( UniqueId id );
   private:
         std::string name;
-        DeclarationNode::StorageClass storageClass;
+        StorageClass storageClass;
         LinkageSpec::Type linkage;
         UniqueId uniqueId;
@@ -55 +66 @@
 class DeclarationWithType : public Declaration {
   public:
-        DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage );
+        DeclarationWithType( const std::string &name, StorageClass sc, LinkageSpec::Type linkage );
         DeclarationWithType( const DeclarationWithType &other );
         virtual ~DeclarationWithType();
@@ -75 +86 @@
         typedef DeclarationWithType Parent;
   public:
-        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init );
+        ObjectDecl( const std::string &name, StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init );
         ObjectDecl( const ObjectDecl &other );
         virtual ~ObjectDecl();
@@ -101 +112 @@
         typedef DeclarationWithType Parent;
   public:
-        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn );
+        FunctionDecl( const std::string &name, StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline );
         FunctionDecl( const FunctionDecl &other );
         virtual ~FunctionDecl();
@@ -112 +123 @@
         CompoundStmt *get_statements() const { return statements; }
         void set_statements( CompoundStmt *newValue ) { statements = newValue; }
-        bool get_isInline() const { return isInline; }
-        bool get_isNoreturn() const { return isNoreturn; }
+//    bool get_isInline() const { return isInline; }
+//    void set_isInline( bool newValue ) { isInline = newValue; }
         std::list< std::string >& get_oldIdents() { return oldIdents; }
         std::list< Declaration* >& get_oldDecls() { return oldDecls; }
@@ -125 +136 @@
         FunctionType *type;
         CompoundStmt *statements;
-        bool isInline, isNoreturn;
+        bool isInline;
         std::list< std::string > oldIdents;
         std::list< Declaration* > oldDecls;
@@ -133 +144 @@
         typedef Declaration Parent;
   public:
-        NamedTypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type );
+        NamedTypeDecl( const std::string &name, StorageClass sc, Type *type );
         NamedTypeDecl( const TypeDecl &other );
         virtual ~NamedTypeDecl();
@@ -158 +169 @@
         enum Kind { Any, Dtype, Ftype };
 
-        TypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type, Kind kind );
+        TypeDecl( const std::string &name, StorageClass sc, Type *type, Kind kind );
         TypeDecl( const TypeDecl &other );
 
@@ -174 +185 @@
         typedef NamedTypeDecl Parent;
   public:
-        TypedefDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type ) : Parent( name, sc, type ) {}
+        TypedefDecl( const std::string &name, StorageClass sc, Type *type ) : Parent( name, sc, type ) {}
         TypedefDecl( const TypedefDecl &other ) : Parent( other ) {}