Changeset 8d182b1 for src/ResolvExpr/RenameVars.cc

Timestamp:

Nov 14, 2023, 12:19:09 PM (23 months ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

1ccae59, 89a8bab

Parents:

df8ba61a (diff), 5625427 (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/ResolvExpr/RenameVars.cc (modified) (4 diffs)

src/ResolvExpr/RenameVars.cc

@@ -21 +21 @@
 #include "AST/Pass.hpp"
 #include "AST/Type.hpp"
-#include "Common/PassVisitor.h"
 #include "Common/ScopedMap.h"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "RenameVars.h"
-#include "SynTree/Declaration.h"   // for DeclarationWithType, TypeDecl, Dec...
-#include "SynTree/Expression.h"    // for Expression
-#include "SynTree/Type.h"          // for Type, TypeInstType, TraitInstType
-#include "SynTree/Visitor.h"       // for acceptAll, maybeAccept
 
 #include "AST/Copy.hpp"
@@ -49 +44 @@
                 }
 
-                void rename( TypeInstType * type ) {
-                        auto it = nameMap.find( type->name );
-                        if ( it != nameMap.end() ) {
-                                type->name = it->second;
-                        }
-                }
-
                 void nextUsage() {
                         ++next_usage_id;
-                }
-
-                void openLevel( Type * type ) {
-                        if ( ! type->forall.empty() ) {
-                                nameMap.beginScope();
-                                // renames all "forall" type names to `_${level}_${name}'
-                                for ( auto td : type->forall ) {
-                                        std::ostringstream output;
-                                        output << "_" << resetCount << "_" << level << "_" << td->name;
-                                        std::string newname( output.str() );
-                                        nameMap[ td->get_name() ] = newname;
-                                        td->name = newname;
-                                        // ditto for assertion names, the next level in
-                                        level++;
-                                }
-                        }
-                }
-
-                void closeLevel( Type * type ) {
-                        if ( !type->forall.empty() ) {
-                                nameMap.endScope();
-                        }
                 }
 
@@ -135 +101 @@
         RenamingData renaming;
 
-        struct RenameVars_old {
-                void previsit( TypeInstType * instType ) {
-                        renaming.openLevel( (Type*)instType );
-                        renaming.rename( instType );
-                }
-                void previsit( Type * type ) {
-                        renaming.openLevel( type );
-                }
-                void postvisit( Type * type ) {
-                        renaming.closeLevel( type );
-                }
-        };
-
-        struct RenameVars_new : public ast::PureVisitor /*: public ast::WithForallSubstitutor*/ {
+        struct RenameVars final : public ast::PureVisitor /*: public ast::WithForallSubstitutor*/ {
                 RenameMode mode;
 
@@ -178 +131 @@
 } // namespace
 
-void renameTyVars( Type * t ) {
-        PassVisitor<RenameVars_old> renamer;
-        t->accept( renamer );
-}
-
 const ast::Type * renameTyVars( const ast::Type * t, RenameMode mode, bool reset ) {
-        ast::Pass<RenameVars_new> renamer;
+        ast::Pass<RenameVars> renamer;
         renamer.core.mode = mode;
         if (mode == GEN_USAGE && reset) {