Changeset 572547c

Timestamp:

Mar 15, 2017, 9:20:57 PM (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:

bf4ac09

Parents:

e61a35e

Message:

rename bound for enumerated types

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (6 diffs)
• ParseNode.h (modified) (4 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 : Tue Mar 14 14:45:52 2017
-// Update Count     : 973
+// Last Modified On : Tue Mar 14 22:42:54 2017
+// Update Count     : 974
 //
 
@@ -118 +118 @@
 void DeclarationNode::print_StorageClass( std::ostream & output, StorageClasses storageClasses ) {
         if ( storageClasses.val != 0 ) {                                        // storage classes ?
-                for ( unsigned int i = 0; i < DeclarationNode::NoStorageClass; i += 1 ) {
+                for ( unsigned int i = 0; i < DeclarationNode::NumStorageClass; i += 1 ) {
                         if ( storageClasses[i] ) {
                                 output << DeclarationNode::storageClassNames[i] << ' ';
@@ -128 +128 @@
 void DeclarationNode::print_FuncSpec( std::ostream & output, DeclarationNode::FuncSpecifiers funcSpec ) {
         if ( funcSpec.val != 0 ) {                                                      // function specifiers ?
-                for ( unsigned int i = 0; i < DeclarationNode::NoFuncSpecifier; i += 1 ) {
+                for ( unsigned int i = 0; i < DeclarationNode::NumFuncSpecifier; i += 1 ) {
                         if ( funcSpec[i] ) {
                                 output << DeclarationNode::funcSpecifierNames[i] << ' ';
@@ -460 +460 @@
 
         if ( (qsrc.val & qdst.val) != 0 ) {                                     // duplicates ?
-                for ( unsigned int i = 0; i < NoTypeQualifier; i += 1 ) { // find duplicates
+                for ( unsigned int i = 0; i < NumTypeQualifier; i += 1 ) { // find duplicates
                         if ( qsrc[i] && qdst[i] ) {
                                 appendError( error, string( "duplicate " ) + DeclarationNode::typeQualifierNames[i] );
@@ -470 +470 @@
 void DeclarationNode::checkSpecifiers( DeclarationNode * src ) {
         if ( (funcSpecs.val & src->funcSpecs.val) != 0 ) {                // duplicates ?
-                for ( unsigned int i = 0; i < NoFuncSpecifier; i += 1 ) { // find duplicates
+                for ( unsigned int i = 0; i < NumFuncSpecifier; i += 1 ) { // find duplicates
                         if ( funcSpecs[i] && src->funcSpecs[i] ) {
                                 appendError( error, string( "duplicate " ) + DeclarationNode::funcSpecifierNames[i] );
@@ -479 +479 @@
         if ( storageClasses.val != 0 && src->storageClasses.val != 0 ) { // any reason to check ?
                 if ( (storageClasses.val & src->storageClasses.val ) != 0 ) { // duplicates ?
-                        for ( unsigned int i = 0; i < NoStorageClass; i += 1 ) { // find duplicates
+                        for ( unsigned int i = 0; i < NumStorageClass; i += 1 ) { // find duplicates
                                 if ( storageClasses[i] && src->storageClasses[i] ) {
                                         appendError( error, string( "duplicate " ) + storageClassNames[i] );

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 14 16:53:19 2017
-// Update Count     : 757
+// Last Modified On : Tue Mar 14 22:41:37 2017
+// Update Count     : 758
 //
 
@@ -203 +203 @@
         // These must remain in the same order as the corresponding DeclarationNode names.
 
-        enum { Extern = 1 << 0, Static = 1 << 1, Auto = 1 << 2, Register = 1 << 3, Threadlocal = 1 << 4, NoStorageClass = 5 };
+        enum { Extern = 1 << 0, Static = 1 << 1, Auto = 1 << 2, Register = 1 << 3, Threadlocal = 1 << 4, NumStorageClass = 5 };
         union StorageClasses {
                 unsigned int val;
@@ -218 +218 @@
         }; // StorageClasses
 
-        enum { Inline = 1 << 0, Noreturn = 1 << 1, Fortran = 1 << 2, NoFuncSpecifier = 3 };
+        enum { Inline = 1 << 0, Noreturn = 1 << 1, Fortran = 1 << 2, NumFuncSpecifier = 3 };
         union FuncSpecifiers {
                 unsigned int val;
@@ -231 +231 @@
         }; // FuncSpecifiers
 
-        enum { Const = 1 << 0, Restrict = 1 << 1, Volatile = 1 << 2, Lvalue = 1 << 3, Mutex = 1 << 4, Atomic = 1 << 5, NoTypeQualifier = 6 };
+        enum { Const = 1 << 0, Restrict = 1 << 1, Volatile = 1 << 2, Lvalue = 1 << 3, Mutex = 1 << 4, Atomic = 1 << 5, NumTypeQualifier = 6 };
         union TypeQualifiers {
                 unsigned int val;

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 15:01:44 2017
-// Update Count     : 548
+// Last Modified On : Tue Mar 14 22:43:20 2017
+// Update Count     : 549
 //
 
@@ -226 +226 @@
 
 void TypeData::print( ostream &os, int indent ) const {
-        for ( int i = 0; i < DeclarationNode::NoTypeQualifier; i += 1 ) {
+        for ( int i = 0; i < DeclarationNode::NumTypeQualifier; i += 1 ) {
                 if ( typeQualifiers[i] ) os << DeclarationNode::typeQualifierNames[ i ] << ' ';
         } // for