Changeset e67a82d for src/ResolvExpr/RenameVars.cc

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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:

fix conflicts

File:

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

src/ResolvExpr/RenameVars.cc

@@ -19 +19 @@
 #include <utility>                 // for pair
 
+#include "AST/ForallSubstitutionTable.hpp"
 #include "AST/Pass.hpp"
 #include "AST/Type.hpp"
@@ -30 +31 @@
 #include "SynTree/Visitor.h"       // for acceptAll, maybeAccept
 
+#include "AST/Copy.hpp"
+
 namespace ResolvExpr {
 
@@ -37 +40 @@
                 int resetCount = 0;
                 ScopedMap< std::string, std::string > nameMap;
+        public:
+                ast::ForallSubstitutionTable subs;
 
-        public:
                 void reset() {
                         level = 0;
@@ -44 +48 @@
                 }
 
-                using mapConstIterator = ScopedMap< std::string, std::string >::const_iterator;
-
                 void rename( TypeInstType * type ) {
-                        mapConstIterator it = nameMap.find( type->name );
+                        auto it = nameMap.find( type->name );
                         if ( it != nameMap.end() ) {
                                 type->name = it->second;
@@ -65 +67 @@
                                         // ditto for assertion names, the next level in
                                         level++;
-                                        // acceptAll( td->assertions, *this );
-                                } // for
-                        } // if
+                                }
+                        }
                 }
 
@@ -77 +78 @@
 
                 const ast::TypeInstType * rename( const ast::TypeInstType * type ) {
-                        mapConstIterator it = nameMap.find( type->name );
+                        // re-linking of base type handled by WithForallSubstitutor
+
+                        // rename
+                        auto it = nameMap.find( type->name );
                         if ( it != nameMap.end() ) {
-                                ast::TypeInstType * mutType = ast::mutate( type );
-                                mutType->name = it->second;
-                    type = mutType;
+                                // 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;
                         }
+
                         return type;
                 }
@@ -88 +95 @@
                 template<typename NodeT>
                 const NodeT * openLevel( const NodeT * type ) {
-                        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;
+                        if ( type->forall.empty() ) return type;
 
-                                        ast::TypeDecl * decl = ast::mutate( td.get() );
-                                        decl->name = newname;
-                                        td = decl;
-                                }
+                        nameMap.beginScope();
+
+                        // 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
                         }
+                        // assertion above means `type = mutType;` is unnecessary
+
                         return type;
                 }
 
-                template<typename NodeT>
-                const NodeT * closeLevel( const NodeT * type ) {
-                        if ( !type->forall.empty() ) {
-                                nameMap.endScope();
-                        }
-                        return type;
+                void closeLevel( const ast::ParameterizedType * type ) {
+                        if ( type->forall.empty() ) return;
+
+                        nameMap.endScope();
                 }
         };
@@ -119 +129 @@
         RenamingData renaming;
 
-        struct RenameVars {
+        struct RenameVars_old {
                 void previsit( TypeInstType * instType ) {
                         renaming.openLevel( (Type*)instType );
@@ -130 +140 @@
                         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 ) {
@@ -146 +161 @@
                         return renaming.rename( renaming.openLevel( type ) );
                 }
-                const ast::ParameterizedType * postvisit( const ast::ParameterizedType * type ) {
-                        return renaming.closeLevel( type );
+                void postvisit( const ast::ParameterizedType * type ) {
+                        renaming.closeLevel( type );
                 }
         };
@@ -154 +169 @@
 
 void renameTyVars( Type * t ) {
-        PassVisitor<RenameVars> renamer;
+        PassVisitor<RenameVars_old> renamer;
         t->accept( renamer );
 }
 
 const ast::Type * renameTyVars( const ast::Type * t ) {
-        ast::Pass<RenameVars> renamer;
-        return t->accept( renamer );
+        ast::Type *tc = ast::deepCopy(t);
+        ast::Pass<RenameVars_new> renamer;
+//      return t->accept( renamer );
+        return tc->accept( renamer );
 }