Changeset 3d56d15b for src/Parser/TypedefTable.cc

Timestamp:

Jun 22, 2018, 2:58:30 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:

203c667, 63238a4

Parents:

6d43cc57

git-author:

Peter A. Buhr <pabuhr@…> (06/22/18 13:56:53)

git-committer:

Peter A. Buhr <pabuhr@…> (06/22/18 14:58:30)

Message:

add push/pop up/down, semantic check for CV in distribution, initial check for structure names

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 : Thu Jun  7 13:17:56 2018
-// Update Count     : 192
+// Last Modified On : Fri Jun 22 06:14:39 2018
+// Update Count     : 206
 //
 
@@ -78 +78 @@
         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
+        //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 );
-        auto scope = kindTable.currentScope() - 1;
-        debugPrint( cerr << "Adding enclosing at " << locn << " " << identifier << " as " << kindName( kind ) << " scope " << scope << endl );
+        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
@@ -91 +92 @@
 void TypedefTable::enterScope() {
         kindTable.beginScope();
-        debugPrint( cerr << "Entering scope " << kindTable.currentScope() << endl );
-        debugPrint( print() );
+        debugPrint( cerr << "Entering scope " << kindTable.currentScope() << endl; print() );
 } // TypedefTable::enterScope
 
 void TypedefTable::leaveScope() {
-        debugPrint( cerr << "Leaving scope " << kindTable.currentScope() << endl );
-        debugPrint( print() );
+        debugPrint( cerr << "Leaving scope " << kindTable.currentScope() << endl; print() );
         kindTable.endScope();
 } // TypedefTable::leaveScope
@@ -114 +113 @@
                 --scope;
                 debugPrint( cerr << endl << "[" << scope << "]" );
-        }
+        } // while
         debugPrint( cerr << endl );
-}
+} // TypedefTable::print
 
 // Local Variables: //