Changeset 93c10de for src/AST/TypeEnvironment.cpp

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.cpp (modified) (8 diffs)

src/AST/TypeEnvironment.cpp

@@ -82 +82 @@
 }
 
-const EqvClass * TypeEnvironment::lookup( const TypeInstType::TypeEnvKey & var ) const {
+const EqvClass * TypeEnvironment::lookup( const TypeEnvKey & var ) const {
         for ( ClassList::const_iterator i = env.begin(); i != env.end(); ++i ) {
                 if ( i->vars.find( var ) != i->vars.end() ) return &*i;
@@ -122 +122 @@
 void TypeEnvironment::writeToSubstitution( TypeSubstitution & sub ) const {
         for ( const auto & clz : env ) {
-                TypeInstType::TypeEnvKey clzRep;
+                TypeEnvKey clzRep;
                 bool first = true;
                 for ( const auto & var : clz.vars ) {
@@ -146 +146 @@
         struct Occurs : public ast::WithVisitorRef<Occurs> {
                 bool result;
-                std::unordered_set< TypeInstType::TypeEnvKey > vars;
+                std::unordered_set< TypeEnvKey > vars;
                 const TypeEnvironment & tenv;
 
-                Occurs( const TypeInstType::TypeEnvKey & var, const TypeEnvironment & env )
+                Occurs( const TypeEnvKey & var, const TypeEnvironment & env )
                 : result( false ), vars(), tenv( env ) {
                         if ( const EqvClass * clz = tenv.lookup( var ) ) {
@@ -170 +170 @@
 
         /// true if `var` occurs in `ty` under `env`
-        bool occurs( const Type * ty, const TypeInstType::TypeEnvKey & var, const TypeEnvironment & env ) {
+        bool occurs( const Type * ty, const TypeEnvKey & var, const TypeEnvironment & env ) {
                 Pass<Occurs> occur{ var, env };
                 maybe_accept( ty, occur );
@@ -258 +258 @@
 namespace {
         /// true if the given type can be bound to the given type variable
-        bool tyVarCompatible( const TypeDecl::Data & data, const Type * type ) {
+        bool tyVarCompatible( const TypeData & data, const Type * type ) {
                 switch ( data.kind ) {
                   case TypeDecl::Dtype:
@@ -279 +279 @@
 
 bool TypeEnvironment::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 & open, WidenMode widen,
                 const SymbolTable & symtab
@@ -319 +319 @@
 
 bool TypeEnvironment::bindVarToVar(
-                const TypeInstType * var1, const TypeInstType * var2, TypeDecl::Data && data,
+                const TypeInstType * var1, const TypeInstType * var2, TypeData && data,
                 AssertionSet & need, AssertionSet & have, const OpenVarSet & open,
                 WidenMode widen, const SymbolTable & symtab
@@ -457 +457 @@
 }
 
-TypeEnvironment::ClassList::iterator TypeEnvironment::internal_lookup( const TypeInstType::TypeEnvKey & var ) {
+TypeEnvironment::ClassList::iterator TypeEnvironment::internal_lookup( const TypeEnvKey & var ) {
         for ( ClassList::iterator i = env.begin(); i != env.end(); ++i ) {
                 if ( i->vars.count( var ) ) return i;