Changeset 68fe077a for src/SynTree

Timestamp:

Mar 16, 2017, 8:23:42 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

26ba208

Parents:

6e8bd43

git-author:

Peter A. Buhr <pabuhr@…> (03/16/17 08:19:39)

git-committer:

Peter A. Buhr <pabuhr@…> (03/16/17 08:23:42)

Message:

move type StorageClasses? from DeclarationNode? to Type

Location:

src/SynTree

Files:

• AggregateDecl.cc (modified) (2 diffs)
• Declaration.cc (modified) (3 diffs)
• Declaration.h (modified) (10 diffs)
• DeclarationWithType.cc (modified) (2 diffs)
• FunctionDecl.cc (modified) (2 diffs)
• NamedTypeDecl.cc (modified) (2 diffs)
• ObjectDecl.cc (modified) (2 diffs)
• Type.cc (modified) (2 diffs)
• Type.h (modified) (2 diffs)
• TypeDecl.cc (modified) (2 diffs)

src/SynTree/AggregateDecl.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 23:56:39 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  7 07:31:47 2017
-// Update Count     : 19
+// Last Modified On : Thu Mar 16 07:49:07 2017
+// Update Count     : 20
 //
 
@@ -20 +20 @@
 
 
-AggregateDecl::AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes ) : Parent( name, DeclarationNode::StorageClasses(), LinkageSpec::Cforall ), body( false ), attributes( attributes ) {
+AggregateDecl::AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes ) : Parent( name, Type::StorageClasses(), LinkageSpec::Cforall ), body( false ), attributes( attributes ) {
 }
 

src/SynTree/Declaration.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  7 07:31:11 2017
-// Update Count     : 23
+// Last Modified On : Thu Mar 16 07:49:18 2017
+// Update Count     : 24
 //
 
@@ -27 +27 @@
 static IdMapType idMap;
 
-Declaration::Declaration( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage )
+Declaration::Declaration( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage )
                 : name( name ), storageClasses( scs ), linkage( linkage ), uniqueId( 0 ) {
 }
@@ -66 +66 @@
 
 
-AsmDecl::AsmDecl( AsmStmt *stmt ) : Declaration( "", DeclarationNode::StorageClasses(), LinkageSpec::C ), stmt( stmt ) {
+AsmDecl::AsmDecl( AsmStmt *stmt ) : Declaration( "", Type::StorageClasses(), LinkageSpec::C ), stmt( stmt ) {
 }
 

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 07:48:23 2017
+// Update Count     : 117
 //
 
@@ -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, DeclarationNode::FuncSpecifiers fs );
         DeclarationWithType( const DeclarationWithType &other );
         virtual ~DeclarationWithType();
@@ -104 +104 @@
         typedef DeclarationWithType Parent;
   public:
-        ObjectDecl( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init,
+        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 * >(), DeclarationNode::FuncSpecifiers fs = DeclarationNode::FuncSpecifiers() );
         ObjectDecl( const ObjectDecl &other );
@@ -132 +132 @@
         typedef DeclarationWithType Parent;
   public:
-        FunctionDecl( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements,
+        FunctionDecl( const std::string &name, Type::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 );
@@ -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 ) {}
 

src/SynTree/DeclarationWithType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  7 07:32:14 2017
-// Update Count     : 23
+// Last Modified On : Thu Mar 16 07:49:27 2017
+// Update Count     : 24
 //
 
@@ -19 +19 @@
 #include "Common/utility.h"
 
-DeclarationWithType::DeclarationWithType( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, DeclarationNode::FuncSpecifiers fs )
+DeclarationWithType::DeclarationWithType( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, DeclarationNode::FuncSpecifiers fs )
         : Declaration( name, scs, linkage ), asmName( nullptr ), attributes( attributes ), fs( fs ) {
 }

src/SynTree/FunctionDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 15 23:33:43 2017
-// Update Count     : 72
+// Last Modified On : Thu Mar 16 07:49:35 2017
+// Update Count     : 73
 //
 
@@ -26 +26 @@
 extern bool translation_unit_nomain;
 
-FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, std::list< Attribute * > attributes, DeclarationNode::FuncSpecifiers fs )
+FunctionDecl::FunctionDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, std::list< Attribute * > attributes, DeclarationNode::FuncSpecifiers fs )
         : Parent( name, scs, linkage, attributes, fs ), type( type ), statements( statements ) {
         // hack forcing the function "main" to have Cforall linkage to replace main even if it is inside an extern

src/SynTree/NamedTypeDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 15 23:25:41 2017
-// Update Count     : 12
+// Last Modified On : Thu Mar 16 07:49:44 2017
+// Update Count     : 13
 //
 
@@ -18 +18 @@
 #include "Common/utility.h"
 
-NamedTypeDecl::NamedTypeDecl( const std::string &name, DeclarationNode::StorageClasses scs, Type *base )
+NamedTypeDecl::NamedTypeDecl( const std::string &name, Type::StorageClasses scs, Type *base )
         : Parent( name, scs, LinkageSpec::Cforall ), base( base ) {}
 

src/SynTree/ObjectDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 15 23:26:22 2017
-// Update Count     : 57
+// Last Modified On : Thu Mar 16 07:49:51 2017
+// Update Count     : 58
 //
 
@@ -22 +22 @@
 #include "Statement.h"
 
-ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, DeclarationNode::FuncSpecifiers fs )
+ObjectDecl::ObjectDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, DeclarationNode::FuncSpecifiers fs )
         : Parent( name, scs, linkage, attributes, fs ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
 }

src/SynTree/Type.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 15 23:14:35 2017
-// Update Count     : 19
+// Last Modified On : Thu Mar 16 07:57:45 2017
+// Update Count     : 20
 //
 
@@ -59 +59 @@
 }
 
+// These must remain in the same order as the corresponding bit fields.
+const char * Type::StorageClasses::Names[] = { "extern", "static", "auto", "register", "_Thread_local" };
 const char * Type::Qualifiers::Names[] = { "const", "restrict", "volatile", "lvalue", "mutex", "_Atomic" };
 

src/SynTree/Type.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 15 23:28:33 2017
-// Update Count     : 89
+// Last Modified On : Thu Mar 16 07:45:29 2017
+// Update Count     : 90
 //
 
@@ -24 +24 @@
 class Type : public BaseSyntaxNode {
   public:
+        // enum must remain in the same order as the corresponding bit fields.
+
+        enum { Extern = 1 << 0, Static = 1 << 1, Auto = 1 << 2, Register = 1 << 3, Threadlocal = 1 << 4, NumStorageClass = 5 };
+        union StorageClasses {
+                static const char * Names[];
+                unsigned int val;
+                struct {
+                        bool is_extern : 1;
+                        bool is_static : 1;
+                        bool is_auto : 1;
+                        bool is_register : 1;
+                        bool is_threadlocal : 1;
+                };
+
+                StorageClasses() : val( 0 ) {}
+                StorageClasses( unsigned int val ) : val( val ) {}
+                bool operator[]( unsigned int i ) const { return val & (1 << i); }
+                bool any() const { return val != 0; }
+                void print( std::ostream & os ) const {
+                        if ( (*this).any() ) {                                          // any storage classes ?
+                                for ( unsigned int i = 0; i < NumStorageClass; i += 1 ) {
+                                        if ( (*this)[i] ) {
+                                                os << StorageClasses::Names[i] << ' ';
+                                        } // if
+                                } // for
+                        } // if
+                }
+        }; // StorageClasses
+
         enum { Const = 1 << 0, Restrict = 1 << 1, Volatile = 1 << 2, Lvalue = 1 << 3, Mutex = 1 << 4, Atomic = 1 << 5, NumTypeQualifier = 6 };
         union Qualifiers {

src/SynTree/TypeDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  7 07:39:09 2017
-// Update Count     : 4
+// Last Modified On : Thu Mar 16 07:49:58 2017
+// Update Count     : 5
 //
 
@@ -18 +18 @@
 #include "Common/utility.h"
 
-TypeDecl::TypeDecl( const std::string &name, DeclarationNode::StorageClasses scs, Type *type, Kind kind ) : Parent( name, scs, type ), kind( kind ), sized( kind == Any || kind == Ttype ) {
+TypeDecl::TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind ) : Parent( name, scs, type ), kind( kind ), sized( kind == Any || kind == Ttype ) {
 }