Changeset 93c10de for src/AST/TypeEnvironment.hpp

Timestamp:

Nov 24, 2022, 11:01:37 AM (19 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/TypeEnvironment.hpp (modified) (8 diffs)

src/AST/TypeEnvironment.hpp

@@ -79 +79 @@
 
 /// Set of open variables
-using OpenVarSet = std::unordered_map< TypeInstType::TypeEnvKey, TypeDecl::Data >;
+using OpenVarSet = std::unordered_map< TypeEnvKey, TypeData >;
 
 /// Merges one set of open vars into another
@@ -95 +95 @@
 /// they bind to.
 struct EqvClass {
-        std::unordered_set< TypeInstType::TypeEnvKey > vars;
+        std::unordered_set< TypeEnvKey > vars;
         ptr<Type> bound;
         bool allowWidening;
-        TypeDecl::Data data;
+        TypeData data;
 
         EqvClass() : vars(), bound(), allowWidening( true ), data() {}
@@ -111 +111 @@
 
         /// Singleton class constructor from substitution
-        EqvClass( const TypeInstType::TypeEnvKey & v, const Type * b )
+        EqvClass( const TypeEnvKey & v, const Type * b )
         : vars{ v }, bound( b ), allowWidening( false ), data( TypeDecl::Dtype, false ) {}
 
         /// Single-var constructor (strips qualifiers from bound type)
-        EqvClass( const TypeInstType::TypeEnvKey & v, const Type * b, bool w, const TypeDecl::Data & d )
+        EqvClass( const TypeEnvKey & v, const Type * b, bool w, const TypeData & d )
         : vars{ v }, bound( b ), allowWidening( w ), data( d ) {
                 reset_qualifiers( bound );
@@ -121 +121 @@
 
         /// Double-var constructor
-        EqvClass( const TypeInstType::TypeEnvKey & v, const TypeInstType::TypeEnvKey & u, bool w, const TypeDecl::Data & d )
+        EqvClass( const TypeEnvKey & v, const TypeEnvKey & u, bool w, const TypeData & d )
         : vars{ v, u }, bound(), allowWidening( w ), data( d ) {}
 
@@ -137 +137 @@
 public:
         /// Finds the equivalence class containing a variable; nullptr for none such
-        const EqvClass * lookup( const TypeInstType::TypeEnvKey & var ) const;
+        const EqvClass * lookup( const TypeEnvKey & var ) const;
 
         /// Add a new equivalence class for each type variable
@@ -181 +181 @@
         /// needed. Returns false on failure.
         bool bindVar(
-                const TypeInstType * typeInst, const Type * bindTo, const TypeDecl::Data & data,
+                const TypeInstType * typeInst, const Type * bindTo, const TypeData & data,
                 AssertionSet & need, AssertionSet & have, const OpenVarSet & openVars,
                 ResolvExpr::WidenMode widen, const SymbolTable & symtab );
@@ -188 +188 @@
         /// classes if needed. Returns false on failure.
         bool bindVarToVar(
-                const TypeInstType * var1, const TypeInstType * var2, TypeDecl::Data && data,
+                const TypeInstType * var1, const TypeInstType * var2, TypeData && data,
                 AssertionSet & need, AssertionSet & have, const OpenVarSet & openVars,
                 ResolvExpr::WidenMode widen, const SymbolTable & symtab );
@@ -213 +213 @@
 
         /// Private lookup API; returns array index of string, or env.size() for not found
-        ClassList::iterator internal_lookup( const TypeInstType::TypeEnvKey & );
+        ClassList::iterator internal_lookup( const TypeEnvKey & );
 };