Changeset 68fe077a for src/Parser/ParseNode.h

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

File:

• src/Parser/ParseNode.h (modified) (4 diffs)

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 15 23:31:02 2017
-// Update Count     : 770
+// Last Modified On : Thu Mar 16 07:46:33 2017
+// Update Count     : 772
 //
 
@@ -201 +201 @@
 class DeclarationNode : public ParseNode {
   public:
-        // These must remain in the same order as the corresponding DeclarationNode names.
-
-        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 { Inline = 1 << 0, Noreturn = 1 << 1, Fortran = 1 << 2, NumFuncSpecifier = 3 };
         union FuncSpecifiers {
@@ -270 +241 @@
         static const char * builtinTypeNames[];
 
-        static DeclarationNode * newStorageClass( StorageClasses );
+        static DeclarationNode * newStorageClass( Type::StorageClasses );
         static DeclarationNode * newFuncSpecifier( FuncSpecifiers );
         static DeclarationNode * newTypeQualifier( Type::Qualifiers );
@@ -368 +339 @@
         TypeData * type;
 
-        StorageClasses storageClasses;
+        Type::StorageClasses storageClasses;
         FuncSpecifiers funcSpecs;