Changeset 6e8bd43 for src/Parser

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

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (6 diffs)
• ParseNode.h (modified) (6 diffs)
• TypeData.cc (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 : Wed Mar 15 22:31:36 2017
-// Update Count     : 983
+// Last Modified On : Wed Mar 15 23:36:49 2017
+// Update Count     : 997
 //
 
@@ -33 +33 @@
 
 // These must remain in the same order as the corresponding DeclarationNode enumerations.
-const char * DeclarationNode::storageClassNames[] = { "extern", "static", "auto", "register", "_Thread_local", "NoStorageClassNames" };
-const char * DeclarationNode::funcSpecifierNames[] = { "inline", "fortran", "_Noreturn", "NoFunctionSpecifierNames" };
+const char * DeclarationNode::StorageClasses::Names[] = { "extern", "static", "auto", "register", "_Thread_local", "NoStorageClassNames" };
+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" };
@@ -115 +115 @@
 }
 
-void DeclarationNode::print_StorageClass( std::ostream & output, StorageClasses storageClasses ) {
-        if ( storageClasses.val != 0 ) {                                        // storage classes ?
-                for ( unsigned int i = 0; i < DeclarationNode::NumStorageClass; i += 1 ) {
-                        if ( storageClasses[i] ) {
-                                output << DeclarationNode::storageClassNames[i] << ' ';
-                        } // if
-                } // for
-        } // if
-} // print_StorageClass
-
-void DeclarationNode::print_FuncSpec( std::ostream & output, DeclarationNode::FuncSpecifiers funcSpec ) {
-        if ( funcSpec.val != 0 ) {                                                      // function specifiers ?
-                for ( unsigned int i = 0; i < DeclarationNode::NumFuncSpecifier; i += 1 ) {
-                        if ( funcSpec[i] ) {
-                                output << DeclarationNode::funcSpecifierNames[i] << ' ';
-                        } // if
-                } // for
-        } // if
-} // print_FuncSpec
-
 void DeclarationNode::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' );
@@ -147 +127 @@
         } // if
 
-        print_StorageClass( os, storageClasses );
-        print_FuncSpec( os, funcSpecs );
+        storageClasses.print( os );
+        funcSpecs.print( os );
 
         if ( type ) {
@@ -461 +441 @@
                 for ( unsigned int i = 0; i < Type::NumTypeQualifier; i += 1 ) { // find duplicates
                         if ( qsrc[i] && qdst[i] ) {
-                                appendError( error, string( "duplicate " ) + Type::QualifierNames[i] );
+                                appendError( error, string( "duplicate " ) + Type::Qualifiers::Names[i] );
                         } // if
                 } // for
@@ -471 +451 @@
                 for ( unsigned int i = 0; i < NumFuncSpecifier; i += 1 ) { // find duplicates
                         if ( funcSpecs[i] && src->funcSpecs[i] ) {
-                                appendError( error, string( "duplicate " ) + DeclarationNode::funcSpecifierNames[i] );
+                                appendError( error, string( "duplicate " ) + FuncSpecifiers::Names[i] );
                         } // if
                 } // for
         } // if
 
-        if ( storageClasses.val != 0 && src->storageClasses.val != 0 ) { // any reason to check ?
+        if ( storageClasses.any() && src->storageClasses.any() ) { // any reason to check ?
                 if ( (storageClasses.val & src->storageClasses.val ) != 0 ) { // duplicates ?
                         for ( unsigned int i = 0; i < NumStorageClass; i += 1 ) { // find duplicates
                                 if ( storageClasses[i] && src->storageClasses[i] ) {
-                                        appendError( error, string( "duplicate " ) + storageClassNames[i] );
+                                        appendError( error, string( "duplicate " ) + StorageClasses::Names[i] );
                                 } // if
                         } // for
                         // src is the new item being added and has a single bit
                 } else if ( ! src->storageClasses.is_threadlocal ) { // conflict ?
-                        appendError( error, string( "conflicting " ) + storageClassNames[ffs( storageClasses.val ) - 1] +
-                                                 " & " + storageClassNames[ffs( src->storageClasses.val ) - 1] );
+                        appendError( error, string( "conflicting " ) + StorageClasses::Names[ffs( storageClasses.val ) - 1] +
+                                                 " & " + StorageClasses::Names[ffs( src->storageClasses.val ) - 1] );
                         src->storageClasses.val = 0;                            // FIX to preserve invariant of one basic storage specifier
                 } // if

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;

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 15 22:22:29 2017
-// Update Count     : 555
+// Last Modified On : Wed Mar 15 22:53:04 2017
+// Update Count     : 557
 //
 
@@ -227 +227 @@
 void TypeData::print( ostream &os, int indent ) const {
         for ( int i = 0; i < Type::NumTypeQualifier; i += 1 ) {
-                if ( qualifiers[i] ) os << Type::QualifierNames[ i ] << ' ';
+                if ( qualifiers[i] ) os << Type::Qualifiers::Names[ i ] << ' ';
         } // for