Changeset ddfd945 for src/Parser/ParseNode.h

Timestamp:

Mar 16, 2017, 8:47:36 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:

fb04321

Parents:

26ba208

Message:

move type FuncSpecifiers? 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 : Thu Mar 16 07:46:33 2017
-// Update Count     : 772
+// Last Modified On : Thu Mar 16 08:32:43 2017
+// Update Count     : 776
 //
 
@@ -201 +201 @@
 class DeclarationNode : public ParseNode {
   public:
-        enum { Inline = 1 << 0, Noreturn = 1 << 1, Fortran = 1 << 2, NumFuncSpecifier = 3 };
-        union FuncSpecifiers {
-                static const char * Names[];
-                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); }
-                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
-
         enum BasicType { Void, Bool, Char, Int, Float, Double, LongDouble, NoBasicType };
         enum ComplexType { Complex, Imaginary, NoComplexType };
@@ -242 +218 @@
 
         static DeclarationNode * newStorageClass( Type::StorageClasses );
-        static DeclarationNode * newFuncSpecifier( FuncSpecifiers );
+        static DeclarationNode * newFuncSpecifier( Type::FuncSpecifiers );
         static DeclarationNode * newTypeQualifier( Type::Qualifiers );
         static DeclarationNode * newBasicType( BasicType );
@@ -339 +315 @@
         TypeData * type;
 
+        Type::FuncSpecifiers funcSpecs;
         Type::StorageClasses storageClasses;
-        FuncSpecifiers funcSpecs;
 
         ExpressionNode * bitfieldWidth;