Changeset 66406f3 for src/Parser/TypedefTable.cc

Timestamp:

Aug 8, 2022, 5:11:25 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

d78c238

Parents:

df00c78

Message:

update debug printing

File:

• src/Parser/TypedefTable.cc (modified) (5 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 May 19 08:30:14 2021
-// Update Count     : 262
+// Last Modified On : Tue Feb 15 08:27:24 2022
+// Update Count     : 275
 //
 
@@ -18 +18 @@
 #include <cassert>                                                                              // for assert
 #include <iostream>
+using namespace std;
 
 #if 0
@@ -28 +29 @@
 
 debugPrint(
-static const char *kindName( int kind ) {
-        switch ( kind ) {
-          case IDENTIFIER: return "identifier";
-          case TYPEDIMname: return "typedim";
-          case TYPEDEFname: return "typedef";
-          case TYPEGENname: return "typegen";
-          default:
-                cerr << "Error: cfa-cpp internal error, invalid kind of identifier" << endl;
-                abort();
-        } // switch
-} // kindName
-)
+        static const char *kindName( int kind ) {
+                switch ( kind ) {
+                  case IDENTIFIER: return "identifier";
+                  case TYPEDIMname: return "typedim";
+                  case TYPEDEFname: return "typedef";
+                  case TYPEGENname: return "typegen";
+                  default:
+                        cerr << "Error: cfa-cpp internal error, invalid kind of identifier" << endl;
+                        abort();
+                } // switch
+        } // kindName
+);
 
 TypedefTable::~TypedefTable() {
@@ -80 +81 @@
 
 void TypedefTable::addToScope( const string & identifier, int kind, const char * locn __attribute__((unused)) ) {
-        auto scope = kindTable.currentScope();
+        KindTable::size_type scope = kindTable.currentScope();
         debugPrint( cerr << "Adding current at " << locn << " " << identifier << " as " << kindName( kind ) << " scope " << scope << endl );
         kindTable.insertAt( scope, identifier, kind );
@@ -86 +87 @@
 
 void TypedefTable::addToEnclosingScope( const string & identifier, int kind, const char * locn __attribute__((unused)) ) {
-        auto scope = kindTable.currentScope() - 1 - kindTable.getNote( kindTable.currentScope() - 1 ).level;
-//      auto scope = level - kindTable.getNote( kindTable.currentScope() - 1 ).level;
+        KindTable::size_type scope = kindTable.currentScope() - 1 - kindTable.getNote( kindTable.currentScope() - 1 ).level;
+//      size_type scope = level - kindTable.getNote( kindTable.currentScope() - 1 ).level;
         debugPrint( cerr << "Adding enclosing at " << locn << " " << identifier << " as " << kindName( kind ) << " scope " << scope << " level " << level << " note " << kindTable.getNote( kindTable.currentScope() - 1 ).level << endl );
-        auto ret = kindTable.insertAt( scope, identifier, kind );
+        pair< KindTable::iterator, bool > ret = kindTable.insertAt( scope, identifier, kind );
         if ( ! ret.second ) ret.first->second = kind;           // exists => update
 } // TypedefTable::addToEnclosingScope