Changeset ddfd945 for src/Parser

Timestamp:

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

fb04321

Parents:

26ba208

Message:

move type FuncSpecifiers? from DeclarationNode? to Type

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (4 diffs)
• ParseNode.h (modified) (4 diffs)
• TypeData.cc (modified) (3 diffs)
• TypeData.h (modified) (2 diffs)
• parser.yy (modified) (2 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 07:59:40 2017
-// Update Count     : 1003
+// Last Modified On : Thu Mar 16 08:37:57 2017
+// Update Count     : 1006
 //
 
@@ -33 +33 @@
 
 // These must remain in the same order as the corresponding DeclarationNode enumerations.
-const char * DeclarationNode::FuncSpecifiers::Names[] = { "inline", "fortran", "_Noreturn", "NoFunctionSpecifierNames" };
 const char * DeclarationNode::basicTypeNames[] = { "void", "_Bool", "char", "int", "float", "double", "long double", "NoBasicTypeNames" };
 const char * DeclarationNode::complexTypeNames[] = { "_Complex", "_Imaginary", "NoComplexTypeNames" };
@@ -186 +185 @@
 } // DeclarationNode::newStorageClass
 
-DeclarationNode * DeclarationNode::newFuncSpecifier( FuncSpecifiers fs ) {
+DeclarationNode * DeclarationNode::newFuncSpecifier( Type::FuncSpecifiers fs ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->funcSpecs = fs;
@@ -448 +447 @@
 void DeclarationNode::checkSpecifiers( DeclarationNode * src ) {
         if ( (funcSpecs.val & src->funcSpecs.val) != 0 ) {      // duplicates ?
-                for ( unsigned int i = 0; i < NumFuncSpecifier; i += 1 ) { // find duplicates
+                for ( unsigned int i = 0; i < Type::NumFuncSpecifier; i += 1 ) { // find duplicates
                         if ( funcSpecs[i] && src->funcSpecs[i] ) {
-                                appendError( error, string( "duplicate " ) + FuncSpecifiers::Names[i] );
+                                appendError( error, string( "duplicate " ) + Type::FuncSpecifiers::Names[i] );
                         } // if
                 } // for

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;

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 07:54:50 2017
-// Update Count     : 558
+// Last Modified On : Thu Mar 16 08:32:42 2017
+// Update Count     : 559
 //
 
@@ -778 +778 @@
 } // buildTypeof
 
-Declaration * buildDecl( const TypeData * td, const string &name, Type::StorageClasses scs, Expression * bitfieldWidth, DeclarationNode::FuncSpecifiers funcSpec, LinkageSpec::Spec linkage, ConstantExpr *asmName, Initializer * init, std::list< Attribute * > attributes ) {
+Declaration * buildDecl( const TypeData * td, const string &name, Type::StorageClasses scs, Expression * bitfieldWidth, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec linkage, ConstantExpr *asmName, Initializer * init, std::list< Attribute * > attributes ) {
         if ( td->kind == TypeData::Function ) {
                 if ( td->function.idList ) {                                    // KR function ?
@@ -814 +814 @@
                         break;
                   default:
-                        ft->get_returnVals().push_back( dynamic_cast< DeclarationWithType * >( buildDecl( td->base, "", Type::StorageClasses(), nullptr, DeclarationNode::FuncSpecifiers(), LinkageSpec::Cforall, nullptr ) ) );
+                        ft->get_returnVals().push_back( dynamic_cast< DeclarationWithType * >( buildDecl( td->base, "", Type::StorageClasses(), nullptr, Type::FuncSpecifiers(), LinkageSpec::Cforall, nullptr ) ) );
                 } // switch
         } else {

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 07:53:41 2017
-// Update Count     : 184
+// Last Modified On : Thu Mar 16 08:32:39 2017
+// Update Count     : 185
 //
 
@@ -109 +109 @@
 TupleType * buildTuple( const TypeData * );
 TypeofType * buildTypeof( const TypeData * );
-Declaration * buildDecl( const TypeData *, const std::string &, Type::StorageClasses, Expression *, DeclarationNode::FuncSpecifiers funcSpec, LinkageSpec::Spec, ConstantExpr *asmName, Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
+Declaration * buildDecl( const TypeData *, const std::string &, Type::StorageClasses, Expression *, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec, ConstantExpr *asmName, Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
 FunctionType * buildFunction( const TypeData * );
 void buildKRFunction( const TypeData::Function_t & function );

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 08:00:59 2017
-// Update Count     : 2309
+// Last Modified On : Thu Mar 16 08:36:17 2017
+// Update Count     : 2310
 //
 
@@ -1460 +1460 @@
                 // Put function specifiers here to simplify parsing rules, but separate them semantically.
         | INLINE                                                                                        // C99
-                { $$ = DeclarationNode::newFuncSpecifier( DeclarationNode::Inline ); }
+                { $$ = DeclarationNode::newFuncSpecifier( Type::Inline ); }
         | FORTRAN                                                                                       // C99
-                { $$ = DeclarationNode::newFuncSpecifier( DeclarationNode::Fortran ); }
+                { $$ = DeclarationNode::newFuncSpecifier( Type::Fortran ); }
         | NORETURN                                                                                      // C11
-                { $$ = DeclarationNode::newFuncSpecifier( DeclarationNode::Noreturn ); }
+                { $$ = DeclarationNode::newFuncSpecifier( Type::Noreturn ); }
         ;