Changeset a7c90d4 for src/SynTree

Timestamp:

Mar 7, 2017, 8:33:43 AM (8 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:

64cb860, c3396e0

Parents:

7fe2498

Message:

change StorageClass? to bitset, support _Thread_local as separate storage-class

Location:

src/SynTree

Files:

• AggregateDecl.cc (modified) (2 diffs)
• Declaration.cc (modified) (3 diffs)
• Declaration.h (modified) (12 diffs)
• DeclarationWithType.cc (modified) (2 diffs)
• FunctionDecl.cc (modified) (5 diffs)
• NamedTypeDecl.cc (modified) (4 diffs)
• ObjectDecl.cc (modified) (4 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 : Mon Feb  6 15:31:23 2017
-// Update Count     : 17
+// Last Modified On : Tue Mar  7 07:31:47 2017
+// Update Count     : 19
 //
 
@@ -20 +20 @@
 
 
-AggregateDecl::AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes ) : Parent( name, DeclarationNode::NoStorageClass, LinkageSpec::Cforall ), body( false ), attributes( attributes ) {
+AggregateDecl::AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes ) : Parent( name, DeclarationNode::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 : Wed Mar  1 20:11:57 2017
-// Update Count     : 17
+// Last Modified On : Tue Mar  7 07:31:11 2017
+// Update Count     : 23
 //
 
@@ -27 +27 @@
 static IdMapType idMap;
 
-Declaration::Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage )
-                : name( name ), storageClass( sc ), linkage( linkage ), uniqueId( 0 ) {
+Declaration::Declaration( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage )
+                : name( name ), storageClasses( scs ), linkage( linkage ), uniqueId( 0 ) {
 }
 
 Declaration::Declaration( const Declaration &other )
-        : name( other.name ), storageClass( other.storageClass ), linkage( other.linkage ), uniqueId( other.uniqueId ) {
+        : name( other.name ), storageClasses( other.storageClasses ), linkage( other.linkage ), uniqueId( other.uniqueId ) {
 }
 
@@ -66 +66 @@
 
 
-AsmDecl::AsmDecl( AsmStmt *stmt ) : Declaration( "", DeclarationNode::NoStorageClass, LinkageSpec::C ), stmt( stmt ) {
+AsmDecl::AsmDecl( AsmStmt *stmt ) : Declaration( "", DeclarationNode::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 : Fri Mar  3 20:59:27 2017
-// Update Count     : 96
+// 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; }
+
         UniqueId get_uniqueId() const { return uniqueId; }
+
         bool get_extension() const { return extension; }
         Declaration *set_extension( bool exten ) { extension = exten; return this; }
@@ -53 +56 @@
   private:
         std::string name;
-        DeclarationNode::StorageClass storageClass;
+        DeclarationNode::StorageClasses storageClasses;
         LinkageSpec::Spec linkage;
         UniqueId uniqueId;
@@ -61 +64 @@
 class DeclarationWithType : public Declaration {
   public:
-        DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, DeclarationNode::FuncSpec fs = DeclarationNode::FuncSpec() );
+        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();
@@ -79 +82 @@
         const std::list< Attribute * >& get_attributes() const { return attributes; }
 
-        DeclarationNode::FuncSpec get_funcSpec() const { return fs; }
-        void set_functionSpecifiers( DeclarationNode::FuncSpec newValue ) { fs = newValue; }
+        DeclarationNode::FuncSpecifiers get_funcSpec() const { return fs; }
+        //void set_functionSpecifiers( DeclarationNode::FuncSpecifiers newValue ) { fs = newValue; }
 
         virtual DeclarationWithType *clone() const = 0;
@@ -95 +98 @@
         ConstantExpr *asmName;
         std::list< Attribute * > attributes;
-        DeclarationNode::FuncSpec fs;
+        DeclarationNode::FuncSpecifiers fs;
 };
 
@@ -101 +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 * >(), DeclarationNode::FuncSpec fs = DeclarationNode::FuncSpec() );
+        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,
-                                  const std::list< Attribute * > attributes = std::list< Attribute * >(), DeclarationNode::FuncSpec fs = DeclarationNode::FuncSpec() );
+        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();
@@ -155 +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();
@@ -190 +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 );
 
@@ -211 +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 ) {}
 

src/SynTree/DeclarationWithType.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  3 20:59:28 2017
-// Update Count     : 19
+// Last Modified On : Tue Mar  7 07:32:14 2017
+// Update Count     : 23
 //
 
@@ -19 +19 @@
 #include "Common/utility.h"
 
-DeclarationWithType::DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, DeclarationNode::FuncSpec fs )
-        : Declaration( name, sc, linkage ), asmName( nullptr ), attributes( attributes ), fs( fs ) {
+DeclarationWithType::DeclarationWithType( const std::string &name, DeclarationNode::StorageClasses scs, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, DeclarationNode::FuncSpecifiers fs )
+        : Declaration( name, scs, linkage ), asmName( nullptr ), attributes( attributes ), fs( fs ) {
 }
 
 DeclarationWithType::DeclarationWithType( const DeclarationWithType &other )
-        : Declaration( other ), mangleName( other.mangleName ), scopeLevel( other.scopeLevel ), fs( other.fs ) {
+                : Declaration( other ), mangleName( other.mangleName ), scopeLevel( other.scopeLevel ), fs( other.fs ) {
         cloneAll( other.attributes, attributes );
         asmName = maybeClone( other.asmName );

src/SynTree/FunctionDecl.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  3 21:29:41 2017
-// Update Count     : 55
+// Last Modified On : Tue Mar  7 07:54:58 2017
+// Update Count     : 68
 //
 
@@ -26 +26 @@
 extern bool translation_unit_nomain;
 
-FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, std::list< Attribute * > attributes, DeclarationNode::FuncSpec fs )
-                : Parent( name, sc, linkage, attributes, fs ), type( type ), statements( statements ) {
-        set_functionSpecifiers( fs );
-
+FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::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
         if ( name == "main" ) {
@@ -37 +35 @@
 
 FunctionDecl::FunctionDecl( const FunctionDecl &other )
-        : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
+                : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
 }
 
@@ -67 +65 @@
         printAll( get_attributes(), os, indent );
 
-        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageClassNames[ get_storageClass() ] << ' ';
-        } // if
+        DeclarationNode::print_StorageClass( os, get_storageClasses() );
         DeclarationNode::print_FuncSpec( os, get_funcSpec() );
 
@@ -95 +91 @@
         // xxx - should printShort print attributes?
 
-        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageClassNames[ get_storageClass() ] << ' ';
-        } // if
+        DeclarationNode::print_StorageClass( os, get_storageClasses() );
         DeclarationNode::print_FuncSpec( os, get_funcSpec() );
 

src/SynTree/NamedTypeDecl.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb 28 16:13:24 2017
-// Update Count     : 4
+// Last Modified On : Tue Mar  7 07:39:41 2017
+// Update Count     : 10
 //
 
@@ -18 +18 @@
 #include "Common/utility.h"
 
-NamedTypeDecl::NamedTypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *base )
-        : Parent( name, sc, LinkageSpec::Cforall ), base( base ) {}
+NamedTypeDecl::NamedTypeDecl( const std::string &name, DeclarationNode::StorageClasses scs, Type *base )
+        : Parent( name, scs, LinkageSpec::Cforall ), base( base ) {}
 
 NamedTypeDecl::NamedTypeDecl( const NamedTypeDecl &other )
@@ -39 +39 @@
                 os << get_name() << ": ";
         } // if
-        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageClassNames[ get_storageClass() ] << ' ';
-        } // if
+        DeclarationNode::print_StorageClass( os, get_storageClasses() );
         os << typeString();
         if ( base ) {
@@ -63 +61 @@
                 os << get_name() << ": ";
         } // if
-        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageClassNames[ get_storageClass() ] << ' ';
-        } // if
+        DeclarationNode::print_StorageClass( os, get_storageClasses() );
         os << typeString();
         if ( 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 : Fri Mar  3 20:59:27 2017
-// Update Count     : 45
+// Last Modified On : Tue Mar  7 07:55:24 2017
+// Update Count     : 54
 //
 
@@ -22 +22 @@
 #include "Statement.h"
 
-ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, DeclarationNode::FuncSpec fs )
-        : Parent( name, sc, linkage, attributes, fs ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
-        set_functionSpecifiers( fs );
+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 )
+        : Parent( name, scs, linkage, attributes, fs ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
 }
 
@@ -48 +47 @@
         printAll( get_attributes(), os, indent );
 
-        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageClassNames[ get_storageClass() ] << ' ';
-        } // if
+        DeclarationNode::print_StorageClass( os, get_storageClasses() );
 
         if ( get_type() ) {
@@ -84 +81 @@
         // xxx - should printShort print attributes?
 
-        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
-                os << DeclarationNode::storageClassNames[ get_storageClass() ] << ' ';
-        } // if
+        DeclarationNode::print_StorageClass( os, get_storageClasses() );
 
         if ( get_type() ) {

src/SynTree/TypeDecl.cc ¶

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