Changeset 2dcd80a for src/AST/TypeSubstitution.cpp

Timestamp:

Dec 14, 2022, 12:23:42 PM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

441a6a7

Parents:

7d9598d8 (diff), d8bdf13 (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/AST/TypeSubstitution.cpp (modified) (3 diffs)

src/AST/TypeSubstitution.cpp

@@ -52 +52 @@
 }
 
-void TypeSubstitution::add( const TypeInstType::TypeEnvKey & key, const Type * actualType) {
+void TypeSubstitution::add( const TypeEnvKey & key, const Type * actualType) {
         typeMap[ key ] = actualType;
 }
@@ -64 +64 @@
 
 const Type *TypeSubstitution::lookup(
-                const TypeInstType::TypeEnvKey & formalType ) const {
+                const TypeEnvKey & formalType ) const {
         TypeMap::const_iterator i = typeMap.find( formalType );
 
@@ -85 +85 @@
 
 const Type *TypeSubstitution::lookup( const TypeInstType * formalType ) const {
-        return lookup( ast::TypeInstType::TypeEnvKey( *formalType ) );
+        return lookup( ast::TypeEnvKey( *formalType ) );
 }