Changeset 6943a987 for src/Parser/TypedefTable.cc

Timestamp:

Aug 29, 2016, 10:33:05 AM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

5e644d3e

Parents:

79841be (diff), 413ad05 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/TypedefTable.cc (modified) (4 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 : Wed Apr 13 16:57:30 2016
-// Update Count     : 24
+// Last Modified On : Mon Aug 15 18:24:42 2016
+// Update Count     : 25
 //
 
@@ -64 +64 @@
                 tableType::iterator curPos = table.find( identifier );
                 if ( curPos == table.end()) {
-                        list<Entry> newList;
+                        list< Entry > newList;
                         newList.push_front( newEntry );
                         table[identifier] = newList;
                 } else {
-                        list<Entry>::iterator listPos = (*curPos ).second.begin();
+                        list< Entry >::iterator listPos = (*curPos ).second.begin();
                         while ( listPos != (*curPos ).second.end() && listPos->scope > scope ) {
                                 listPos++;
@@ -127 +127 @@
         debugPrint( "Leaving scope " << currentScope << endl );
         for ( tableType::iterator i = table.begin(); i != table.end(); ) {
-                list<Entry> &declList = (*i).second;
+                list< Entry > &declList = (*i).second;
                 while ( ! declList.empty() && declList.front().scope == currentScope ) {
                         declList.pop_front();
@@ -157 +157 @@
         for ( tableType::const_iterator i = table.begin(); i != table.end(); i++) {
                 debugPrint( (*i ).first << ": " );
-                list<Entry> declList = (*i).second;
-                for ( list<Entry>::const_iterator j = declList.begin(); j != declList.end(); j++ ) {
+                list< Entry > declList = (*i).second;
+                for ( list< Entry >::const_iterator j = declList.begin(); j != declList.end(); j++ ) {
                         debugPrint( "(" << (*j).scope << " " << (*j).kind << ") " );
                 }