Changes in src/ResolvExpr/RenameVars.cc [e0e9a0b:f5edcb4]

File:

• src/ResolvExpr/RenameVars.cc (modified) (10 diffs)

src/ResolvExpr/RenameVars.cc

@@ -19 +19 @@
 #include <utility>                 // for pair
 
-#include "AST/ForallSubstitutionTable.hpp"
 #include "AST/Pass.hpp"
 #include "AST/Type.hpp"
@@ -38 +37 @@
                 int resetCount = 0;
                 ScopedMap< std::string, std::string > nameMap;
+
         public:
-                ast::ForallSubstitutionTable subs;
-
                 void reset() {
                         level = 0;
@@ -46 +44 @@
                 }
 
+                using mapConstIterator = ScopedMap< std::string, std::string >::const_iterator;
+
                 void rename( TypeInstType * type ) {
-                        auto it = nameMap.find( type->name );
+                        mapConstIterator it = nameMap.find( type->name );
                         if ( it != nameMap.end() ) {
                                 type->name = it->second;
@@ -65 +65 @@
                                         // ditto for assertion names, the next level in
                                         level++;
-                                }
-                        }
+                                        // acceptAll( td->assertions, *this );
+                                } // for
+                        } // if
                 }
 
@@ -76 +77 @@
 
                 const ast::TypeInstType * rename( const ast::TypeInstType * type ) {
-                        // re-linking of base type handled by WithForallSubstitutor
-
-                        // rename
-                        auto it = nameMap.find( type->name );
+                        mapConstIterator it = nameMap.find( type->name );
                         if ( it != nameMap.end() ) {
-                                // unconditionally mutate because map will *always* have different name, 
-                                // if this mutates, will *always* have been mutated by ForallSubstitutor above
-                                ast::TypeInstType * mut = ast::mutate( type );
-                                mut->name = it->second;
-                    type = mut;
+                                ast::TypeInstType * mutType = ast::mutate( type );
+                                mutType->name = it->second;
+                    type = mutType;
                         }
-
                         return type;
                 }
@@ -93 +88 @@
                 template<typename NodeT>
                 const NodeT * openLevel( const NodeT * type ) {
-                        if ( type->forall.empty() ) return type;
-                        
-                        nameMap.beginScope();
+                        if ( !type->forall.empty() ) {
+                                nameMap.beginScope();
+                                // Load new names from this forall clause and perform renaming.
+                                NodeT * mutType = ast::mutate( type );
+                                for ( ast::ptr< ast::TypeDecl > & td : mutType->forall ) {
+                                        std::ostringstream output;
+                                        output << "_" << resetCount << "_" << level << "_" << td->name;
+                                        std::string newname( output.str() );
+                                        nameMap[ td->name ] = newname;
+                                        ++level;
 
-                        // Load new names from this forall clause and perform renaming.
-                        NodeT * mutType = ast::mutate( type );
-                        assert( type == mutType && "mutated type must be unique from ForallSubstitutor" );
-                        for ( ast::ptr< ast::TypeDecl > & td : mutType->forall ) {
-                                std::ostringstream output;
-                                output << "_" << resetCount << "_" << level << "_" << td->name;
-                                std::string newname =  output.str();
-                                nameMap[ td->name ] = newname;
-                                ++level;
-
-                                ast::TypeDecl * mutDecl = ast::mutate( td.get() );
-                                assert( td == mutDecl && "mutated decl must be unique from ForallSubstitutor" );
-                                mutDecl->name = newname;
-                                // assertion above means `td = mutDecl;` is unnecessary
+                                        ast::TypeDecl * decl = ast::mutate( td.get() );
+                                        decl->name = newname;
+                                        td = decl;
+                                }
                         }
-                        // assertion above means `type = mutType;` is unnecessary
-
                         return type;
                 }
 
-                void closeLevel( const ast::ParameterizedType * type ) {
-                        if ( type->forall.empty() ) return;
-                        
-                        nameMap.endScope();
+                template<typename NodeT>
+                const NodeT * closeLevel( const NodeT * type ) {
+                        if ( !type->forall.empty() ) {
+                                nameMap.endScope();
+                        }
+                        return type;
                 }
         };
@@ -127 +119 @@
         RenamingData renaming;
 
-        struct RenameVars_old {
+        struct RenameVars {
                 void previsit( TypeInstType * instType ) {
                         renaming.openLevel( (Type*)instType );
@@ -138 +130 @@
                         renaming.closeLevel( type );
                 }
-        };
-        
-        struct RenameVars_new /*: public ast::WithForallSubstitutor*/ {
-                #warning when old RenameVars goes away, replace hack below with global pass inheriting from WithForallSubstitutor
-                ast::ForallSubstitutionTable & subs = renaming.subs;
 
                 const ast::FunctionType * previsit( const ast::FunctionType * type ) {
@@ -159 +146 @@
                         return renaming.rename( renaming.openLevel( type ) );
                 }
-                void postvisit( const ast::ParameterizedType * type ) {
-                        renaming.closeLevel( type );
+                const ast::ParameterizedType * postvisit( const ast::ParameterizedType * type ) {
+                        return renaming.closeLevel( type );
                 }
         };
@@ -167 +154 @@
 
 void renameTyVars( Type * t ) {
-        PassVisitor<RenameVars_old> renamer;
+        PassVisitor<RenameVars> renamer;
         t->accept( renamer );
 }
 
 const ast::Type * renameTyVars( const ast::Type * t ) {
-        ast::Pass<RenameVars_new> renamer;
+        ast::Pass<RenameVars> renamer;
         return t->accept( renamer );
 }