Changeset b067d9b for src/Parser/TypedefTable.cc

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypedefTable.cc -- 
+// TypedefTable.cc --
 //
 // Author           : Peter A. Buhr
 // 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 : Wed Jul 25 15:32:35 2018
+// Update Count     : 258
 //
 
@@ -51 +51 @@
 } // TypedefTable::exists
 
+bool TypedefTable::existsCurr( const string & identifier ) {
+        return kindTable.findAt( kindTable.currentScope() - 1, identifier ) != kindTable.end();
+} // TypedefTable::exists
+
 int TypedefTable::isKind( const string & identifier ) const {
         KindTable::const_iterator posn = kindTable.find( identifier );
@@ -77 +81 @@
         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
+        kindTable.insertAt( scope, identifier, kind );
 } // 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 );
+        auto scope = kindTable.currentScope() - 1 - kindTable.getNote( kindTable.currentScope() - 1 ).level;
+//      auto 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 );
-        if ( ! ret.second ) ret.first->second = kind;           // exists => update
+        if ( ! ret.second ) ret.first->second = kind;   // exists => update
 } // TypedefTable::addToEnclosingScope
 
 void TypedefTable::enterScope() {
-        kindTable.beginScope();
-        debugPrint( cerr << "Entering scope " << kindTable.currentScope() << endl );
-        debugPrint( print() );
+        kindTable.beginScope( (Note){ 0, false } );
+        debugPrint( cerr << "Entering scope " << kindTable.currentScope() << " level " << level << 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
 
+void TypedefTable::up( bool forall ) {
+        level += 1;
+        kindTable.getNote( kindTable.currentScope() ) = (Note){ level, forall || getEnclForall() };
+        debugPrint( cerr << "Up " << " level " << level << " note " << kindTable.getNote( level ).level << ", " << kindTable.getNote( level ).forall << endl; );
+} // TypedefTable::up
+
+void TypedefTable::down() {
+        level -= 1;
+        debugPrint( cerr << "Down " << " level " << level << " note " << kindTable.getNote( level ).level << endl; );
+} // TypedefTable::down
+
 void TypedefTable::print( void ) const {
         KindTable::size_type scope = kindTable.currentScope();
-        debugPrint( cerr << "[" << scope << "]" );
+        debugPrint( cerr << "[" << scope << "] " << kindTable.getNote( scope ).level << ", " << kindTable.getNote( scope ).forall << ":" );
         for ( KindTable::const_iterator i = kindTable.begin(); i != kindTable.end(); i++ ) {
                 while ( i.get_level() != scope ) {
                         --scope;
-                        debugPrint( cerr << endl << "[" << scope << "]" );
+                        debugPrint( cerr << endl << "[" << scope << "] " << kindTable.getNote( scope ).level << ", " << kindTable.getNote( scope ).forall << ":" );
                 } // while
                 debugPrint( cerr << " " << (*i).first << ":" << kindName( (*i).second ) );
@@ -113 +125 @@
         while ( scope > 0 ) {
                 --scope;
-                debugPrint( cerr << endl << "[" << scope << "]" );
-        }
+                debugPrint( cerr << endl << "[" << scope << "] " << kindTable.getNote( scope ).level << ", " << kindTable.getNote( scope ).forall << ":" );
+        } // while
         debugPrint( cerr << endl );
-}
+} // TypedefTable::print
 
 // Local Variables: //