Changeset c95b115

Timestamp:

Nov 15, 2017, 1:59:51 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, resolv-new, with_gc

Children:

490db327

Parents:

f0994a1

Message:

Add reset counter to type variable renaming scheme to ensure renamings are unique across resolver calls

Location:

src/ResolvExpr

Files:

• RenameVars.cc (modified) (3 diffs)
• RenameVars.h (modified) (1 diff)

src/ResolvExpr/RenameVars.cc

@@ -29 +29 @@
         RenameVars global_renamer;
 
-        RenameVars::RenameVars() : level( 0 ) {
+        RenameVars::RenameVars() : level( 0 ), resetCount( 0 ) {
                 mapStack.push_front( std::map< std::string, std::string >() );
         }
@@ -35 +35 @@
         void RenameVars::reset() {
                 level = 0;
+                resetCount++;
         }
 
@@ -130 +131 @@
                         for ( Type::ForallList::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
                                 std::ostringstream output;
-                                output << "_" << level << "_" << (*i)->get_name();
+                                output << "_" << resetCount << "_" << level << "_" << (*i)->get_name();
                                 std::string newname( output.str() );
                                 mapStack.front()[ (*i)->get_name() ] = newname;

src/ResolvExpr/RenameVars.h

@@ -48 +48 @@
                 void typeBefore( Type *type );
                 void typeAfter( Type *type );
-                int level;
+                int level, resetCount;
                 std::list< std::map< std::string, std::string > > mapStack;
         };