Changeset 64b6913 for src/Parser/DeclarationNode.cc

Timestamp:

Mar 16, 2017, 8:19:39 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:

26ba208

Parents:

6e8bd43

Message:

move type StorageClasses? from DeclarationNode? to Type

File:

• src/Parser/DeclarationNode.cc (modified) (7 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 23:36:49 2017
-// Update Count     : 997
+// Last Modified On : Thu Mar 16 07:59:40 2017
+// Update Count     : 1003
 //
 
@@ -33 +33 @@
 
 // These must remain in the same order as the corresponding DeclarationNode enumerations.
-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" };
@@ -181 +180 @@
 
 
-DeclarationNode * DeclarationNode::newStorageClass( StorageClasses sc ) {
+DeclarationNode * DeclarationNode::newStorageClass( Type::StorageClasses sc ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->storageClasses = sc;
@@ -458 +457 @@
         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
+                        for ( unsigned int i = 0; i < Type::NumStorageClass; i += 1 ) { // find duplicates
                                 if ( storageClasses[i] && src->storageClasses[i] ) {
-                                        appendError( error, string( "duplicate " ) + StorageClasses::Names[i] );
+                                        appendError( error, string( "duplicate " ) + Type::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 " ) + StorageClasses::Names[ffs( storageClasses.val ) - 1] +
-                                                 " & " + StorageClasses::Names[ffs( src->storageClasses.val ) - 1] );
+                        appendError( error, string( "conflicting " ) + Type::StorageClasses::Names[ffs( storageClasses.val ) - 1] +
+                                                 " & " + Type::StorageClasses::Names[ffs( src->storageClasses.val ) - 1] );
                         src->storageClasses.val = 0;                            // FIX to preserve invariant of one basic storage specifier
                 } // if
@@ -970 +969 @@
                                 } else if ( StructDecl * agg = dynamic_cast< StructDecl * >( decl ) ) {
                                         StructInstType * inst = new StructInstType( Type::Qualifiers(), agg->get_name() );
-                                        auto obj = new ObjectDecl( "", DeclarationNode::StorageClasses(), linkage, nullptr, inst, nullptr );
+                                        auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
                                         obj->location = cur->location;
                                         * out++ = obj;
@@ -976 +975 @@
                                 } else if ( UnionDecl * agg = dynamic_cast< UnionDecl * >( decl ) ) {
                                         UnionInstType * inst = new UnionInstType( Type::Qualifiers(), agg->get_name() );
-                                        auto obj = new ObjectDecl( "", DeclarationNode::StorageClasses(), linkage, nullptr, inst, nullptr );
+                                        auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
                                         obj->location = cur->location;
                                         * out++ = obj;
@@ -1023 +1022 @@
                 assertf( sizeof(kindMap)/sizeof(kindMap[0] == NoTypeClass-1), "DeclarationNode::build: kindMap is out of sync." );
                 assertf( variable.tyClass < sizeof(kindMap)/sizeof(kindMap[0]), "Variable's tyClass is out of bounds." );
-                TypeDecl * ret = new TypeDecl( *name, DeclarationNode::StorageClasses(), nullptr, kindMap[ variable.tyClass ] );
+                TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ] );
                 buildList( variable.assertions, ret->get_assertions() );
                 return ret;