Changeset 68cd1ce for src/SynTree/Declaration.cc

Timestamp:

Jun 13, 2015, 8:30:25 AM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

a1d5d2a

Parents:

7bcf74e

Message:

unify and fix storage class

File:

• src/SynTree/Declaration.cc (modified) (3 diffs)

src/SynTree/Declaration.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 08:18:35 2015
-// Update Count     : 2
+// Last Modified On : Sat Jun 13 08:07:20 2015
+// Update Count     : 9
 //
 
@@ -22 +22 @@
 #include "utility.h"
 
-const char* Declaration::storageClassName[] = { "", "auto", "static", "extern", "register" };  
-
 static UniqueId lastUniqueId = 0;
 typedef std::map< UniqueId, Declaration* > IdMapType;
 static IdMapType idMap;
 
-Declaration::Declaration( const std::string &name, StorageClass sc, LinkageSpec::Type linkage )
-        : name( name ), storageClass( sc ), linkage( linkage ), uniqueId( 0 ) {
+Declaration::Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage )
+                : name( name ), storageClass( sc ), linkage( linkage ), uniqueId( 0 ) {
 }
 
 Declaration::Declaration( const Declaration &other )
-        : name( other.name ), storageClass( other.storageClass ), linkage( other.linkage ), uniqueId( other.uniqueId ) {
+                : name( other.name ), storageClass( other.storageClass ), linkage( other.linkage ), uniqueId( other.uniqueId ) {
 }
 
@@ -44 +42 @@
 }
 
-/* static class method */
 Declaration *Declaration::declFromId( UniqueId id ) {
         IdMapType::const_iterator i = idMap.find( id );
-        if ( i != idMap.end() ) {
-                return i->second;
-        } else {
-                return 0;
-        } // if
+        return i != idMap.end() ? i->second : 0;
 }
 
-/* static class method */
 void Declaration::dumpIds( std::ostream &os ) {
         for ( IdMapType::const_iterator i = idMap.begin(); i != idMap.end(); ++i ) {