Changeset 28f3a19 for src/Parser/TypedefTable.cc

Timestamp:

Jun 27, 2018, 3:28:41 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

b21c77a

Parents:

0182bfa (diff), 63238a4 (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' into with_gc

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 : Tue May 22 08:40:01 2018
-// Update Count     : 121
+// Last Modified On : Fri Jun 22 06:14:39 2018
+// Update Count     : 206
 //
 
@@ -17 +17 @@
 #include "TypedefTable.h"
 #include <cassert>                                                                              // for assert
+#include <iostream>
 
 #if 0
-#include <iostream>
-#define debugPrint( x ) cerr << x
+#define debugPrint( code ) code
 #else
-#define debugPrint( x )
+#define debugPrint( code )
 #endif
 
 using namespace std;                                                                    // string, iostream
 
+debugPrint(
+static const char *kindName( int kind ) {
+        switch ( kind ) {
+          case IDENTIFIER: return "identifier";
+          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() {
         if ( ! SemanticErrorThrow && kindTable.currentScope() != 0 ) {
-                // std::cerr << "scope failure " << kindTable.currentScope() << endl;
+                cerr << "Error: cfa-cpp internal error, scope failure " << kindTable.currentScope() << endl;
+                abort();
         } // if
 } // TypedefTable::~TypedefTable
@@ -44 +58 @@
 } // TypedefTable::isKind
 
-void TypedefTable::changeKind( const string & identifier, int kind ) {
-        KindTable::iterator posn = kindTable.find( identifier );
-        if ( posn != kindTable.end() ) posn->second = kind;     // exists => update
-} // TypedefTable::changeKind
-
 // SKULLDUGGERY: Generate a typedef for the aggregate name so the aggregate does not have to be qualified by
 // "struct". Only generate the typedef, if the name is not in use. The typedef is implicitly (silently) removed if the
 // name is explicitly used.
-void TypedefTable::makeTypedef( const string & name ) {
+void TypedefTable::makeTypedef( const string & name, int kind ) {
+//    Check for existence is necessary to handle:
+//        struct Fred {};
+//        void Fred();
+//        void fred() {
+//           struct Fred act; // do not add as type in this scope
+//           Fred();
+//        }
         if ( ! typedefTable.exists( name ) ) {
-                typedefTable.addToEnclosingScope( name, TYPEDEFname );
+                typedefTable.addToEnclosingScope( name, kind, "MTD" );
         } // if
 } // TypedefTable::makeTypedef
 
-void TypedefTable::addToEnclosingScope( const std::string & identifier, int kind ) {
-        assert( kindTable.currentScope() >= 1 );
-        auto scope = kindTable.currentScope() - 1;
-        debugPrint( "Adding " << identifier << " as kind " << kind << " scope " << scope << endl );
+void TypedefTable::addToScope( const string & identifier, int kind, const char * locn __attribute__((unused)) ) {
+        auto scope = kindTable.currentScope();
+        debugPrint( cerr << "Adding current at " << locn << " " << identifier << " as " << kindName( kind ) << " scope " << scope << endl );
+        auto ret = kindTable.insertAt( scope, identifier, kind );
+        //if ( ! ret.second ) ret.first->second = kind;         // exists => update
+        assert( ret.first->second == kind );                            // exists
+} // TypedefTable::addToScope
+
+void TypedefTable::addToEnclosingScope( const string & identifier, int kind, const char * locn __attribute__((unused)) ) {
+        assert( kindTable.currentScope() >= 1 + level );
+        auto scope = kindTable.currentScope() - 1 - level;
+        debugPrint( cerr << "Adding enclosing at " << locn << " " << identifier << " as " << kindName( kind ) << " scope " << scope << " level " << level << endl );
         auto ret = kindTable.insertAt( scope, identifier, kind );
         if ( ! ret.second ) ret.first->second = kind;           // exists => update
@@ -68 +92 @@
 void TypedefTable::enterScope() {
         kindTable.beginScope();
-        debugPrint( "Entering scope " << kindTable.currentScope() << endl );
+        debugPrint( cerr << "Entering scope " << kindTable.currentScope() << endl; print() );
 } // TypedefTable::enterScope
 
 void TypedefTable::leaveScope() {
-        debugPrint( "Leaving scope " << kindTable.currentScope() << endl );
+        debugPrint( cerr << "Leaving scope " << kindTable.currentScope() << endl; 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 << ":" << kindName( (*i).second ) );
+        } // for
+        while ( scope > 0 ) {
+                --scope;
+                debugPrint( cerr << endl << "[" << scope << "]" );
+        } // while
+        debugPrint( cerr << endl );
+} // TypedefTable::print
 
 // Local Variables: //