Changeset 93c10de for src/AST/TypeSubstitution.hpp

Timestamp:

Nov 24, 2022, 11:01:37 AM (21 months 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.

File:

• src/AST/TypeSubstitution.hpp (modified) (3 diffs)

src/AST/TypeSubstitution.hpp

@@ -72 +72 @@
 
         void add( const TypeInstType * formalType, const Type *actualType );
-        void add( const TypeInstType::TypeEnvKey & key, const Type *actualType );
+        void add( const TypeEnvKey & key, const Type *actualType );
         void add( const TypeSubstitution &other );
         void remove( const TypeInstType * formalType );
-        const Type *lookup( const TypeInstType::TypeEnvKey & formalType ) const;
+        const Type *lookup( const TypeEnvKey & formalType ) const;
         const Type *lookup( const TypeInstType * formalType ) const;
         bool empty() const;
@@ -105 +105 @@
         friend class Pass;
 
-        typedef std::unordered_map< TypeInstType::TypeEnvKey, ptr<Type> > TypeMap;
+        typedef std::unordered_map< TypeEnvKey, ptr<Type> > TypeMap;
         TypeMap typeMap;
 
@@ -184 +184 @@
                 int subCount = 0;
                 bool freeOnly;
-                typedef std::unordered_set< TypeInstType::TypeEnvKey > BoundVarsType;
+                typedef std::unordered_set< TypeEnvKey > BoundVarsType;
                 BoundVarsType boundVars;