Changeset de62360d for src/Parser/TypedefTable.cc

Timestamp:

Jun 24, 2015, 4:04:19 PM (10 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:

94e0864d

Parents:

a1d5d2a

Message:

fix computed goto, fixed -std=, implicit typedefs for enum and aggregates, add _Noreturn _Thread_local

File:

• src/Parser/TypedefTable.cc (modified) (9 diffs)

src/Parser/TypedefTable.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:20:13 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 15:24:03 2015
-// Update Count     : 2
+// Last Modified On : Sun Jun 21 11:46:15 2015
+// Update Count     : 7
 //
 
@@ -29 +29 @@
 TypedefTable::TypedefTable() : currentScope( 0 ) {}
 
-bool TypedefTable::isKind( string identifier, kind_t kind ) const {
+bool TypedefTable::isKind( const string &identifier, kind_t kind ) const {
         tableType::const_iterator id_pos = table.find( identifier );
-        if ( id_pos == table.end()) {
+        if ( id_pos == table.end() ) {
                 return true;
         } else {
                 return (*((*id_pos ).second.begin())).kind == kind;
-        }
+        } // if
 }
 
-bool TypedefTable::isIdentifier( string identifier ) const {
+bool TypedefTable::isIdentifier( const string &identifier ) const {
         return isKind( identifier, ID );
 }
 
-bool TypedefTable::isTypedef( string identifier ) const {
+bool TypedefTable::isTypedef( const string &identifier ) const {
         return isKind( identifier, TD );
 }
 
-bool TypedefTable::isTypegen( string identifier ) const {
+bool TypedefTable::isTypegen( const string &identifier ) const {
         return isKind( identifier, TG );
 }
@@ -66 +66 @@
                         while ( listPos != (*curPos ).second.end() && listPos->scope > scope ) {
                                 listPos++;
-                        }
+                        } // while
                         (*curPos ).second.insert( listPos, newEntry );
-                }
-        }
+                } // if
+        } // if
 }
 
@@ -102 +102 @@
 }
 
-void TypedefTable::openContext( std::string contextName ) {
+void TypedefTable::openContext( const std::string &contextName ) {
         map< string, deferListType >::iterator i = contexts.find( contextName );
         if ( i != contexts.end() ) {
@@ -108 +108 @@
                 for ( deferListType::iterator i = entries.begin(); i != entries.end(); i++) {
                         addToEnclosingScope( i->identifier, i->kind );
-                }
-        }
+                } // for
+        } // if
 }
 
-void TypedefTable::enterScope( void ) {
+void TypedefTable::enterScope() {
         currentScope += 1;
         deferListStack.push( deferListType() );
@@ -119 +119 @@
 }
 
-void TypedefTable::leaveScope( void ) {
+void TypedefTable::leaveScope() {
         debugPrint( "Leaving scope " << currentScope << endl );
         for ( tableType::iterator i = table.begin(); i != table.end(); ) {
@@ -129 +129 @@
                         table.erase( i++ );
                 } else ++i;
-        }
+        } // for
         currentScope -= 1;
         for ( deferListType::iterator i = deferListStack.top().begin(); i != deferListStack.top().end(); i++) {
                 addToCurrentScope( i->identifier, i->kind );
-        }
+        } // for
         deferListStack.pop();
         debugPrint( "nextIdentifiers size is " << nextIdentifiers.size() << " top is " << nextIdentifiers.top() << endl );
@@ -139 +139 @@
 }
 
-void TypedefTable::enterContext( std::string contextName ) {
+void TypedefTable::enterContext( const std::string &contextName ) {
         currentContext = contextName;
         contextScope = currentScope;
 }
 
-void TypedefTable::leaveContext( void ) {
+void TypedefTable::leaveContext() {
         currentContext = "";
 }
@@ -156 +156 @@
                 }
                 debugPrint( endl );
-        }
+        } // for
 }