Changeset 6e8bd43 for src/Parser/ParseNode.h

Timestamp:

Mar 16, 2017, 7:41:45 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:

64b6913, 68fe077a

Parents:

905eca1

Message:

cleanup interface to qualifiers/specifiers

File:

• src/Parser/ParseNode.h (modified) (6 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 22:17:50 2017
-// Update Count     : 762
+// Last Modified On : Wed Mar 15 23:31:02 2017
+// Update Count     : 770
 //
 
@@ -205 +205 @@
         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 {
@@ -213 +214 @@
                         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 {
+                static const char * Names[];
                 unsigned int val;
                 struct {
@@ -229 +242 @@
                 FuncSpecifiers( 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 function specifiers ?
+                                for ( unsigned int i = 0; i < NumFuncSpecifier; i += 1 ) {
+                                        if ( (*this)[i] ) {
+                                                os << FuncSpecifiers::Names[i] << ' ';
+                                        } // if
+                                } // for
+                        } // if
+                }
         }; // FuncSpecifiers
 
@@ -239 +262 @@
         enum BuiltinType { Valist, Zero, One, NoBuiltinType };
 
-        static const char * storageClassNames[];
-        static const char * funcSpecifierNames[];
         static const char * basicTypeNames[];
         static const char * complexTypeNames[];
@@ -348 +369 @@
 
         StorageClasses storageClasses;
-        static void print_StorageClass( std::ostream & output, StorageClasses storageClasses );
-
         FuncSpecifiers funcSpecs;
-        static void print_FuncSpec( std::ostream & output, FuncSpecifiers funcSpecs );
 
         ExpressionNode * bitfieldWidth;