Changes in src/Parser/ParseNode.h [a7c90d4:e496303]

File:

• src/Parser/ParseNode.h (modified) (5 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 : Tue Mar  7 08:10:53 2017
-// Update Count     : 726
+// Last Modified On : Tue Mar 14 16:53:19 2017
+// Update Count     : 757
 //
 
@@ -19 +19 @@
 #include <string>
 #include <list>
-#include <bitset>
 #include <iterator>
 #include <memory>
@@ -204 +203 @@
         // These must remain in the same order as the corresponding DeclarationNode names.
 
-        enum StorageClass { Extern, Static, Auto, Register, Threadlocal, NoStorageClass,
-                                                ExternClass = 1 << Extern, StaticClass = 1 << Static, AutoClass = 1 << Auto, RegisterClass = 1 << Register, ThreadlocalClass = 1 << Threadlocal };
-        enum FuncSpecifier { Inline, Noreturn, Fortran, NoFuncSpecifier,
-                                                 InlineSpec = 1 << Inline, NoreturnSpec = 1 << Noreturn, FortranSpec = 1 << Fortran };
-        enum TypeQualifier { Const, Restrict, Volatile, Lvalue, Mutex, Atomic, NoTypeQualifier };
+        enum { Extern = 1 << 0, Static = 1 << 1, Auto = 1 << 2, Register = 1 << 3, Threadlocal = 1 << 4, NoStorageClass = 5 };
+        union StorageClasses {
+                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); }
+        }; // StorageClasses
+
+        enum { Inline = 1 << 0, Noreturn = 1 << 1, Fortran = 1 << 2, NoFuncSpecifier = 3 };
+        union FuncSpecifiers {
+                unsigned int val;
+                struct {
+                        bool is_inline : 1;
+                        bool is_noreturn : 1;
+                        bool is_fortran : 1;
+                };
+                FuncSpecifiers() : val( 0 ) {}
+                FuncSpecifiers( unsigned int val ) : val( val ) {}
+                bool operator[]( unsigned int i ) const { return val & (1 << i); }
+        }; // FuncSpecifiers
+
+        enum { Const = 1 << 0, Restrict = 1 << 1, Volatile = 1 << 2, Lvalue = 1 << 3, Mutex = 1 << 4, Atomic = 1 << 5, NoTypeQualifier = 6 };
+        union TypeQualifiers {
+                unsigned int val;
+                struct {
+                        bool is_const : 1;
+                        bool is_restrict : 1;
+                        bool is_volatile : 1;
+                        bool is_lvalue : 1;
+                        bool is_mutex : 1;
+                        bool is_atomic : 1;
+                };
+                TypeQualifiers() : val( 0 ) {}
+                TypeQualifiers( unsigned int val ) : val( val ) {}
+                bool operator[]( unsigned int i ) const { return val & (1 << i); }
+        }; // TypeQualifiers
+
         enum BasicType { Void, Bool, Char, Int, Float, Double, LongDouble, NoBasicType };
         enum ComplexType { Complex, Imaginary, NoComplexType };
@@ -228 +266 @@
         static const char * builtinTypeNames[];
 
-        static DeclarationNode * newStorageClass( StorageClass );
-        static DeclarationNode * newFuncSpecifier( FuncSpecifier );
-        static DeclarationNode * newTypeQualifier( TypeQualifier );
+        static DeclarationNode * newStorageClass( StorageClasses );
+        static DeclarationNode * newFuncSpecifier( FuncSpecifiers );
+        static DeclarationNode * newTypeQualifier( TypeQualifiers );
         static DeclarationNode * newBasicType( BasicType );
         static DeclarationNode * newComplexType( ComplexType );
@@ -326 +364 @@
         TypeData * type;
 
-        typedef std::bitset< DeclarationNode::NoStorageClass > StorageClasses;
         StorageClasses storageClasses;
         static void print_StorageClass( std::ostream & output, StorageClasses storageClasses );
 
-        typedef std::bitset< DeclarationNode::NoFuncSpecifier > FuncSpecifiers;
         FuncSpecifiers funcSpecs;
         static void print_FuncSpec( std::ostream & output, FuncSpecifiers funcSpecs );