Changeset 93c10de for src/ResolvExpr

Timestamp:

Nov 24, 2022, 11:01:37 AM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

82a90d4

Parents:

78de1e5

Message:

Minimal changes to pull out nested types, TypeInstType::TypeEnvKey and TypeDecl::Data (now TypeData) from there parent types. Although they do connect to the parent types they were nested in they are used on their own most of the time.

Location:

src/ResolvExpr

Files:

• CandidateFinder.cpp (modified) (1 diff)
• FindOpenVars.cc (modified) (2 diffs)
• RenameVars.cc (modified) (2 diffs)
• Unify.cc (modified) (1 diff)

src/ResolvExpr/CandidateFinder.cpp

@@ -221 +221 @@
         ) {
                 for ( auto & tyvar : type->forall ) {
-                        unifiableVars[ *tyvar ] = ast::TypeDecl::Data{ tyvar->base };
+                        unifiableVars[ *tyvar ] = ast::TypeData{ tyvar->base };
                 }
                 for ( auto & assn : type->assertions ) {

src/ResolvExpr/FindOpenVars.cc

@@ -113 +113 @@
                                 if ( nextIsOpen ) {
                                         for ( auto & decl : type->forall ) {
-                                                open[ *decl ] = ast::TypeDecl::Data{ decl->base };
+                                                open[ *decl ] = ast::TypeData{ decl->base };
                                         }
                                         for ( auto & assert : type->assertions ) {
@@ -120 +120 @@
                                 } else {
                                         for ( auto & decl : type->forall ) {
-                                                closed[ *decl ] = ast::TypeDecl::Data{ decl->base };    
+                                                closed[ *decl ] = ast::TypeData{ decl->base };
                                         }
                                         for ( auto & assert : type->assertions ) {

src/ResolvExpr/RenameVars.cc

@@ -42 +42 @@
                 int next_usage_id = 1;
                 ScopedMap< std::string, std::string > nameMap;
-                ScopedMap< std::string, ast::TypeInstType::TypeEnvKey > idMap;
+                ScopedMap< std::string, ast::TypeEnvKey > idMap;
         public:
                 void reset() {
@@ -121 +121 @@
                                         assert(false);
                                 }
-                                idMap[ td->name ] = ast::TypeInstType::TypeEnvKey(*mut);
-                                
+                                idMap[ td->name ] = ast::TypeEnvKey( *mut );
+
                                 td = mut;
                         }

src/ResolvExpr/Unify.cc

@@ -1166 +1166 @@
                         if ( entry1->second.kind != entry2->second.kind ) return false;
                         return env.bindVarToVar(
-                                var1, var2, ast::TypeDecl::Data{ entry1->second, entry2->second }, need, have,
+                                var1, var2, ast::TypeData{ entry1->second, entry2->second }, need, have,
                                 open, widen, symtab );
                 } else if ( isopen1 ) {