Changeset 93c10de for src/GenPoly

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/GenPoly

Files:

• GenPoly.cc (modified) (2 diffs)
• GenPoly.h (modified) (1 diff)

src/GenPoly/GenPoly.cc

@@ -783 +783 @@
         const ast::FunctionType * function = getFunctionType( expr->func->result );
         assertf( function, "ApplicationExpr has non-function type: %s", toString( expr->func->result ).c_str() );
-        TypeVarMap exprTyVars = { ast::TypeDecl::Data() };
+        TypeVarMap exprTyVars = { ast::TypeData() };
         makeTypeVarMap( function, exprTyVars );
         return needsBoxing( param, arg, exprTyVars, subst );
@@ -793 +793 @@
 
 void addToTypeVarMap( const ast::TypeInstType * type, TypeVarMap & typeVars ) {
-        typeVars.insert( *type, ast::TypeDecl::Data( type->base ) );
+        typeVars.insert( *type, ast::TypeData( type->base ) );
 }
 

src/GenPoly/GenPoly.h

@@ -30 +30 @@
 
         typedef ErasableScopedMap< std::string, TypeDecl::Data > TyVarMap;
-        using TypeVarMap = ErasableScopedMap< ast::TypeInstType::TypeEnvKey, ast::TypeDecl::Data >;
+        using TypeVarMap = ErasableScopedMap< ast::TypeEnvKey, ast::TypeData >;
 
         /// Replaces a TypeInstType by its referrent in the environment, if applicable