Changes in src/GenPoly/GenPoly.cc [4da152a:c8837e5]

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 : Mon Oct 24 15:19:00 2022
-// Update Count     : 17
+// Last Modified On : Fri Oct  7 15:25:00 2022
+// Update Count     : 16
 //
 
@@ -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;
@@ -203 +194 @@
 
         if ( auto inst = dynamic_cast< const ast::TypeInstType * >( type ) ) {
-                if ( typeVars.find( *inst ) != typeVars.end() ) return type;
+                if ( typeVars.find( inst->typeString() ) != typeVars.end() ) return type;
         } else if ( auto array = dynamic_cast< const ast::ArrayType * >( type ) ) {
                 return isPolyType( array->base, subst );
@@ -236 +227 @@
 
         if ( auto inst = dynamic_cast<ast::TypeInstType const *>( type ) ) {
-                auto var = typeVars.find( *inst );
+                auto var = typeVars.find( inst->name );
                 if ( var != typeVars.end() && var->second.isComplete ) {
-                        return inst;
+
                 }
         } else if ( auto inst = dynamic_cast<ast::StructInstType const *>( type ) ) {
@@ -793 +784 @@
 
 void addToTypeVarMap( const ast::TypeInstType * type, TypeVarMap & typeVars ) {
-        typeVars.insert( *type, ast::TypeDecl::Data( type->base ) );
+        typeVars.insert( type->typeString(), ast::TypeDecl::Data( type->base ) );
 }
 
@@ -825 +816 @@
         }
 
+void printTypeVarMap( std::ostream &os, const TypeVarMap & typeVars ) {
+        for ( auto const & pair : typeVars ) {
+                os << pair.first << " (" << pair.second << ") ";
+        } // for
+        os << std::endl;
+}
+
 } // namespace GenPoly