Changeset 68cd1ce for src/SynTree/Declaration.h

Timestamp:

Jun 13, 2015, 8:30:25 AM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, string, with_gc

Children:

a1d5d2a

Parents:

7bcf74e

Message:

unify and fix storage class

File:

• src/SynTree/Declaration.h (modified) (10 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 : Sun Jun  7 22:03:43 2015
-// Update Count     : 7
+// Last Modified On : Fri Jun 12 23:55:26 2015
+// Update Count     : 24
 //
 
@@ -21 +21 @@
 #include "Mutator.h"
 #include "Parser/LinkageSpec.h"
+#include "Parser/ParseNode.h"
 
 class Declaration {
   public:
-        enum StorageClass {  
-                NoStorageClass,
-                Extern,
-                Static,
-                Auto,
-                Register,
-                Inline,
-                Fortran,
-        };      
-
-        Declaration( const std::string &name, StorageClass sc, LinkageSpec::Type linkage );
+        Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage );
         Declaration( const Declaration &other );
         virtual ~Declaration();
@@ -40 +31 @@
         const std::string &get_name() const { return name; }
         void set_name( std::string newValue ) { name = newValue; }
-        StorageClass get_storageClass() const { return storageClass; }
-        void set_storageClass( StorageClass newValue ) { storageClass = newValue; }
+        DeclarationNode::StorageClass get_storageClass() const { return storageClass; }
+        void set_storageClass( DeclarationNode::StorageClass newValue ) { storageClass = newValue; }
         LinkageSpec::Type get_linkage() const { return linkage; }
         void set_linkage( LinkageSpec::Type newValue ) { linkage = newValue; }
@@ -53 +44 @@
         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;
-        StorageClass storageClass;
+        DeclarationNode::StorageClass storageClass;
         LinkageSpec::Type linkage;
         UniqueId uniqueId;
@@ -66 +55 @@
 class DeclarationWithType : public Declaration {
   public:
-        DeclarationWithType( const std::string &name, StorageClass sc, LinkageSpec::Type linkage );
+        DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage );
         DeclarationWithType( const DeclarationWithType &other );
         virtual ~DeclarationWithType();
@@ -86 +75 @@
         typedef DeclarationWithType Parent;
   public:
-        ObjectDecl( const std::string &name, StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init );
+        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init );
         ObjectDecl( const ObjectDecl &other );
         virtual ~ObjectDecl();
@@ -112 +101 @@
         typedef DeclarationWithType Parent;
   public:
-        FunctionDecl( const std::string &name, StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline );
+        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline );
         FunctionDecl( const FunctionDecl &other );
         virtual ~FunctionDecl();
@@ -144 +133 @@
         typedef Declaration Parent;
   public:
-        NamedTypeDecl( const std::string &name, StorageClass sc, Type *type );
+        NamedTypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type );
         NamedTypeDecl( const TypeDecl &other );
         virtual ~NamedTypeDecl();
@@ -169 +158 @@
         enum Kind { Any, Dtype, Ftype };
 
-        TypeDecl( const std::string &name, StorageClass sc, Type *type, Kind kind );
+        TypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type, Kind kind );
         TypeDecl( const TypeDecl &other );
 
@@ -185 +174 @@
         typedef NamedTypeDecl Parent;
   public:
-        TypedefDecl( const std::string &name, StorageClass sc, Type *type ) : Parent( name, sc, type ) {}
+        TypedefDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type ) : Parent( name, sc, type ) {}
         TypedefDecl( const TypedefDecl &other ) : Parent( other ) {}