Changeset 3d26610 for src/Parser/TypedefTable.cc

Timestamp:

May 31, 2018, 4:05:01 PM (6 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, with_gc

Children:

b368dd8

Parents:

bd946e4

Message:

more push/pop updates

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 : Tue May 22 08:40:01 2018
-// Update Count     : 121
+// Last Modified On : Wed May 30 18:04:38 2018
+// Update Count     : 148
 //
 
@@ -20 +20 @@
 #if 0
 #include <iostream>
-#define debugPrint( x ) cerr << x
+#define debugPrint( code ) code
 #else
-#define debugPrint( x )
+#define debugPrint( code )
 #endif
 
@@ -29 +29 @@
 TypedefTable::~TypedefTable() {
         if ( ! SemanticErrorThrow && kindTable.currentScope() != 0 ) {
-                // std::cerr << "scope failure " << kindTable.currentScope() << endl;
+                std::cerr << "scope failure " << kindTable.currentScope() << endl;
         } // if
 } // TypedefTable::~TypedefTable
@@ -54 +54 @@
 void TypedefTable::makeTypedef( const string & name ) {
         if ( ! typedefTable.exists( name ) ) {
-                typedefTable.addToEnclosingScope( name, TYPEDEFname );
+                typedefTable.addToEnclosingScope( name, TYPEDEFname /*, "MTD"*/ );
         } // if
 } // TypedefTable::makeTypedef
 
-void TypedefTable::addToEnclosingScope( const std::string & identifier, int kind ) {
+void TypedefTable::addToScope( const std::string & identifier, int kind /*, const char * locn*/ ) {
+        auto scope = kindTable.currentScope();
+        debugPrint( cerr << "Adding at " /* << locn */ << " " << identifier << " as kind " << kind << " scope " << scope << endl );
+        auto ret = kindTable.insertAt( scope, identifier, kind );
+        if ( ! ret.second ) ret.first->second = kind;           // exists => update
+} // TypedefTable::addToScope
+
+void TypedefTable::addToEnclosingScope( const std::string & identifier, int kind /*, const char * locn*/ ) {
         assert( kindTable.currentScope() >= 1 );
         auto scope = kindTable.currentScope() - 1;
-        debugPrint( "Adding " << identifier << " as kind " << kind << " scope " << scope << endl );
+        debugPrint( cerr << "Adding2 at " /* << locn */ << " " << identifier << " as kind " << kind << " scope " << scope << endl );
         auto ret = kindTable.insertAt( scope, identifier, kind );
         if ( ! ret.second ) ret.first->second = kind;           // exists => update
@@ -68 +75 @@
 void TypedefTable::enterScope() {
         kindTable.beginScope();
-        debugPrint( "Entering scope " << kindTable.currentScope() << endl );
+        debugPrint( cerr << "Entering scope " << kindTable.currentScope() << endl );
+        debugPrint( print() );
 } // TypedefTable::enterScope
 
 void TypedefTable::leaveScope() {
-        debugPrint( "Leaving scope " << kindTable.currentScope() << endl );
+        debugPrint( cerr << "Leaving scope " << kindTable.currentScope() << endl );
+        debugPrint( print() );
         kindTable.endScope();
 } // TypedefTable::leaveScope
 
-// void TypedefTable::print( void ) const {
-//      for ( KindTable::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++ ) {
-//                      debugPrint( "(" << (*j).scope << " " << (*j).kind << ") " );
-//              }
-//              debugPrint( endl );
-//      } // for
-// }
+void TypedefTable::print( void ) const {
+        KindTable::size_type scope = kindTable.currentScope();
+        debugPrint( cerr << "[" << scope << "]" );
+        for ( KindTable::const_iterator i = kindTable.begin(); i != kindTable.end(); i++ ) {
+                while ( i.get_level() != scope ) {
+                        --scope;
+                        debugPrint( cerr << endl << "[" << scope << "]" );
+                } // while
+                debugPrint( cerr << " " << (*i).first << ":" << (*i).second );
+        } // for
+        while ( scope > 0 ) {
+                --scope;
+                debugPrint( cerr << endl << "[" << scope << "]" );
+        }
+        debugPrint( cerr << endl );
+}
 
 // Local Variables: //