Changeset 63be3387 for src/GenPoly/GenPoly.cc

Timestamp:

Nov 14, 2022, 11:52:44 AM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

7d9598d8

Parents:

b77f0e1 (diff), 19a8c40 (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/GenPoly/GenPoly.cc (modified) (6 diffs)

src/GenPoly/GenPoly.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct  7 15:25:00 2022
-// Update Count     : 16
+// Last Modified On : Mon Oct 24 15:19:00 2022
+// Update Count     : 17
 //
 
@@ -118 +118 @@
         }
 
+        const Type* replaceTypeInst( const Type* type, const TypeSubstitution* env ) {
+                if ( ! env ) return type;
+                if ( auto typeInst = dynamic_cast< const TypeInstType* >( type ) ) {
+                        Type *newType = env->lookup( typeInst->get_name() );
+                        if ( newType ) return newType;
+                }
+                return type;
+        }
+
         const ast::Type * replaceTypeInst(const ast::Type * type, const ast::TypeSubstitution * env) {
                 if (!env) return type;
-                if (auto typeInst = dynamic_cast<const ast::TypeInstType*> (type)) {
+                if ( auto typeInst = dynamic_cast<const ast::TypeInstType*>(type) ) {
                         auto newType = env->lookup(typeInst);
                         if (newType) return newType;
@@ -194 +203 @@
 
         if ( auto inst = dynamic_cast< const ast::TypeInstType * >( type ) ) {
-                if ( typeVars.find( inst->typeString() ) != typeVars.end() ) return type;
+                if ( typeVars.find( *inst ) != typeVars.end() ) return type;
         } else if ( auto array = dynamic_cast< const ast::ArrayType * >( type ) ) {
                 return isPolyType( array->base, subst );
@@ -227 +236 @@
 
         if ( auto inst = dynamic_cast<ast::TypeInstType const *>( type ) ) {
-                auto var = typeVars.find( inst->name );
+                auto var = typeVars.find( *inst );
                 if ( var != typeVars.end() && var->second.isComplete ) {
-
+                        return inst;
                 }
         } else if ( auto inst = dynamic_cast<ast::StructInstType const *>( type ) ) {
@@ -784 +793 @@
 
 void addToTypeVarMap( const ast::TypeInstType * type, TypeVarMap & typeVars ) {
-        typeVars.insert( type->typeString(), ast::TypeDecl::Data( type->base ) );
+        typeVars.insert( *type, ast::TypeDecl::Data( type->base ) );
 }
 
@@ -816 +825 @@
         }
 
-void printTypeVarMap( std::ostream &os, const TypeVarMap & typeVars ) {
-        for ( auto const & pair : typeVars ) {
-                os << pair.first << " (" << pair.second << ") ";
-        } // for
-        os << std::endl;
-}
-
 } // namespace GenPoly