Changeset 90152a4 for src/ResolvExpr/TypeEnvironment.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

File:

• src/ResolvExpr/TypeEnvironment.cc (modified) (11 diffs)

src/ResolvExpr/TypeEnvironment.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:19:47 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 12:23:36 2015
-// Update Count     : 3
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Mon Jun 18 11:58:00 2018
+// Update Count     : 4
 //
 
@@ -17 +17 @@
 #include <algorithm>                   // for copy, set_intersection
 #include <iterator>                    // for ostream_iterator, insert_iterator
-#include <utility>                     // for pair
+#include <memory>                      // for unique_ptr
+#include <utility>                     // for pair, move
 
 #include "Common/utility.h"            // for maybeClone
 #include "SynTree/Type.h"              // for Type, FunctionType, Type::Fora...
 #include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
+#include "Tuples/Tuples.h"             // for isTtype
 #include "TypeEnvironment.h"
+#include "typeops.h"                   // for occurs
+#include "Unify.h"                     // for unifyInexact
 
 namespace ResolvExpr {
@@ -44 +48 @@
 
         void EqvClass::initialize( const EqvClass &src, EqvClass &dest ) {
+                initialize( src, dest, src.type );
+        }
+
+        void EqvClass::initialize( const EqvClass &src, EqvClass &dest, const Type *ty ) {
                 dest.vars = src.vars;
-                dest.type = maybeClone( src.type );
+                dest.type = maybeClone( ty );
                 dest.allowWidening = src.allowWidening;
                 dest.data = src.data;
         }
 
-        EqvClass::EqvClass() : type( 0 ), allowWidening( true ) {
+        EqvClass::EqvClass() : type( nullptr ), allowWidening( true ) {
         }
 
         EqvClass::EqvClass( const EqvClass &other ) {
                 initialize( other, *this );
+        }
+
+        EqvClass::EqvClass( const EqvClass &other, const Type *ty ) {
+                initialize( other, *this, ty );
+        }
+
+        EqvClass::EqvClass( EqvClass &&other )
+        : vars{std::move(other.vars)}, type{other.type},
+          allowWidening{std::move(other.allowWidening)}, data{std::move(other.data)} {
+                  other.type = nullptr;
         }
 
@@ -64 +82 @@
         }
 
+        EqvClass &EqvClass::operator=( EqvClass &&other ) {
+                if ( this == &other ) return *this;
+                delete type;
+
+                vars = std::move(other.vars);
+                type = other.type;
+                other.type = nullptr;
+                allowWidening = std::move(other.allowWidening);
+                data = std::move(other.data);
+
+                return *this;
+        }
+
         EqvClass::~EqvClass() {
                 delete type;
+        }
+
+        void EqvClass::set_type( Type* ty ) {
+                if ( ty == type ) return;
+                delete type;
+                type = ty;
         }
 
@@ -82 +119 @@
         }
 
-        bool TypeEnvironment::lookup( const std::string &var, EqvClass &eqvClass ) const {
+        const EqvClass* TypeEnvironment::lookup( const std::string &var ) const {
                 for ( std::list< EqvClass >::const_iterator i = env.begin(); i != env.end(); ++i ) {
-                        if ( i->vars.find( var ) != i->vars.end() ) {
-///       std::cout << var << " is in class ";
-///       i->print( std::cout );
-                                eqvClass = *i;
-                                return true;
-                        }
-///     std::cout << var << " is not in class ";
-///     i->print( std::cout );
-                } // for
-                return false;
-        }
-
-        void TypeEnvironment::add( const EqvClass &eqvClass ) {
-                std::list< EqvClass >::iterator i = env.begin();
-                while ( i != env.end() ) {
-                        std::list< EqvClass >::iterator next = i;
-                        next++;
-                        std::set< std::string > intersection;
-                        std::set_intersection( i->vars.begin(), i->vars.end(), eqvClass.vars.begin(), eqvClass.vars.end(), std::inserter( intersection, intersection.begin() ) );
-                        if ( ! intersection.empty() ) {
-                                env.erase( i );
-                        } // if
+                        if ( i->vars.find( var ) != i->vars.end() ) return &*i;
+                } // for
+                return nullptr;
+        }
+
+        /// Removes any class from env that intersects eqvClass
+        void filterOverlappingClasses( std::list<EqvClass> &env, const EqvClass &eqvClass ) {
+                for ( auto i = env.begin(); i != env.end(); ) {
+                        auto next = i;
+                        ++next;
+                        std::set<std::string> intersection;
+                        std::set_intersection( i->vars.begin(), i->vars.end(), eqvClass.vars.begin(), eqvClass.vars.end(),
+                                std::inserter( intersection, intersection.begin() ) );
+                        if ( ! intersection.empty() ) { env.erase( i ); }
                         i = next;
-                } // while
-                env.insert( env.end(), eqvClass );
+                }
+        }
+
+        void TypeEnvironment::add( EqvClass &&eqvClass ) {
+                filterOverlappingClasses( env, eqvClass );
+                env.push_back( std::move(eqvClass) );
         }
 
@@ -116 +149 @@
                         newClass.vars.insert( (*i)->get_name() );
                         newClass.data = TypeDecl::Data{ (*i) };
-                        env.push_back( newClass );
-                } // for
+                        env.push_back( std::move(newClass) );
+                } // for
+        }
+
+        void TypeEnvironment::add( const TypeSubstitution & sub ) {
+                EqvClass newClass;
+                for ( auto p : sub ) {
+                        newClass.vars.insert( p.first );
+                        newClass.type = p.second->clone();
+                        newClass.allowWidening = false;
+                        // Minimal assumptions. Not technically correct, but might be good enough, and
+                        // is the best we can do at the moment since information is lost in the
+                        // transition to TypeSubstitution
+                        newClass.data = TypeDecl::Data{ TypeDecl::Dtype, false };
+                        add( std::move(newClass) );
+                }
         }
 
@@ -123 +170 @@
                 for ( std::list< EqvClass >::const_iterator theClass = env.begin(); theClass != env.end(); ++theClass ) {
                         for ( std::set< std::string >::const_iterator theVar = theClass->vars.begin(); theVar != theClass->vars.end(); ++theVar ) {
-///       std::cerr << "adding " << *theVar;
                                 if ( theClass->type ) {
-///         std::cerr << " bound to ";
-///         theClass->type->print( std::cerr );
-///         std::cerr << std::endl;
                                         sub.add( *theVar, theClass->type );
                                 } else if ( theVar != theClass->vars.begin() ) {
                                         TypeInstType *newTypeInst = new TypeInstType( Type::Qualifiers(), *theClass->vars.begin(), theClass->data.kind == TypeDecl::Ftype );
-///         std::cerr << " bound to variable " << *theClass->vars.begin() << std::endl;
                                         sub.add( *theVar, newTypeInst );
                                         delete newTypeInst;
@@ -137 +179 @@
                         } // for
                 } // for
-///   std::cerr << "input env is:" << std::endl;
-///   print( std::cerr, 8 );
-///   std::cerr << "sub is:" << std::endl;
-///   sub.print( std::cerr, 8 );
                 sub.normalize();
         }
 
         void TypeEnvironment::print( std::ostream &os, Indenter indent ) const {
-                for ( std::list< EqvClass >::const_iterator i = env.begin(); i != env.end(); ++i ) {
-                        i->print( os, indent );
+                for ( const EqvClass & theClass : env ) {
+                        theClass.print( os, indent );
                 } // for
         }
@@ -152 +190 @@
         std::list< EqvClass >::iterator TypeEnvironment::internal_lookup( const std::string &var ) {
                 for ( std::list< EqvClass >::iterator i = env.begin(); i != env.end(); ++i ) {
-                        if ( i->vars.find( var ) == i->vars.end() ) {
-                                return i;
-                        } // if
+                        if ( i->vars.count( var ) ) return i;
                 } // for
                 return env.end();
@@ -161 +197 @@
         void TypeEnvironment::simpleCombine( const TypeEnvironment &second ) {
                 env.insert( env.end(), second.env.begin(), second.env.end() );
-        }
-
-        void TypeEnvironment::combine( const TypeEnvironment &second, Type *(*combineFunc)( Type*, Type* ) ) {
-                TypeEnvironment secondCopy( second );
-                for ( std::list< EqvClass >::iterator firstClass = env.begin(); firstClass != env.end(); ++firstClass ) {
-                        EqvClass &newClass = *firstClass;
-                        std::set< std::string > newVars;
-                        for ( std::set< std::string >::const_iterator var = firstClass->vars.begin(); var != firstClass->vars.end(); ++var ) {
-                                std::list< EqvClass >::iterator secondClass = secondCopy.internal_lookup( *var );
-                                if ( secondClass != secondCopy.env.end() ) {
-                                        newVars.insert( secondClass->vars.begin(), secondClass->vars.end() );
-                                        if ( secondClass->type ) {
-                                                if ( newClass.type ) {
-                                                        Type *newType = combineFunc( newClass.type, secondClass->type );
-                                                        delete newClass.type;
-                                                        newClass.type = newType;
-                                                        newClass.allowWidening = newClass.allowWidening && secondClass->allowWidening;
-                                                } else {
-                                                        newClass.type = secondClass->type->clone();
-                                                        newClass.allowWidening = secondClass->allowWidening;
-                                                } // if
-                                        } // if
-                                        secondCopy.env.erase( secondClass );
-                                } // if
-                        } // for
-                        newClass.vars.insert( newVars.begin(), newVars.end() );
-                } // for
-                for ( std::list< EqvClass >::iterator secondClass = secondCopy.env.begin(); secondClass != secondCopy.env.end(); ++secondClass ) {
-                        env.push_back( *secondClass );
-                } // for
         }
 
@@ -212 +218 @@
         }
 
+        bool isFtype( Type *type ) {
+                if ( dynamic_cast< FunctionType* >( type ) ) {
+                        return true;
+                } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
+                        return typeInst->get_isFtype();
+                } // if
+                return false;
+        }
+
+        bool tyVarCompatible( const TypeDecl::Data & data, Type *type ) {
+                switch ( data.kind ) {
+                  case TypeDecl::Dtype:
+                        // to bind to an object type variable, the type must not be a function type.
+                        // if the type variable is specified to be a complete type then the incoming
+                        // type must also be complete
+                        // xxx - should this also check that type is not a tuple type and that it's not a ttype?
+                        return ! isFtype( type ) && (! data.isComplete || type->isComplete() );
+                  case TypeDecl::Ftype:
+                        return isFtype( type );
+                  case TypeDecl::Ttype:
+                        // ttype unifies with any tuple type
+                        return dynamic_cast< TupleType * >( type ) || Tuples::isTtype( type );
+                  default:
+                        assertf(false, "Unhandled tyvar kind: %d", data.kind);
+                } // switch
+                return false;
+        }
+
+        bool TypeEnvironment::bindVar( TypeInstType *typeInst, Type *bindTo, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer ) {
+
+                // remove references from other, so that type variables can only bind to value types
+                bindTo = bindTo->stripReferences();
+                OpenVarSet::const_iterator tyvar = openVars.find( typeInst->get_name() );
+                assert( tyvar != openVars.end() );
+                if ( ! tyVarCompatible( tyvar->second, bindTo ) ) {
+                        return false;
+                } // if
+                if ( occurs( bindTo, typeInst->get_name(), *this ) ) {
+                        return false;
+                } // if
+                auto curClass = internal_lookup( typeInst->get_name() );
+                if ( curClass != env.end() ) {
+                        if ( curClass->type ) {
+                                Type *common = 0;
+                                // attempt to unify equivalence class type (which has qualifiers stripped, so they must be restored) with the type to bind to
+                                std::unique_ptr< Type > newType( curClass->type->clone() );
+                                newType->get_qualifiers() = typeInst->get_qualifiers();
+                                if ( unifyInexact( newType.get(), bindTo, *this, need, have, openVars, widenMode & WidenMode( curClass->allowWidening, true ), indexer, common ) ) {
+                                        if ( common ) {
+                                                common->get_qualifiers() = Type::Qualifiers{};
+                                                curClass->set_type( common );
+                                        } // if
+                                } else return false;
+                        } else {
+                                Type* newType = bindTo->clone();
+                                newType->get_qualifiers() = Type::Qualifiers{};
+                                curClass->set_type( newType );
+                                curClass->allowWidening = widenMode.widenFirst && widenMode.widenSecond;
+                        } // if
+                } else {
+                        EqvClass newClass;
+                        newClass.vars.insert( typeInst->get_name() );
+                        newClass.type = bindTo->clone();
+                        newClass.type->get_qualifiers() = Type::Qualifiers();
+                        newClass.allowWidening = widenMode.widenFirst && widenMode.widenSecond;
+                        newClass.data = data;
+                        env.push_back( std::move(newClass) );
+                } // if
+                return true;
+        }
+
+        bool TypeEnvironment::bindVarToVar( TypeInstType *var1, TypeInstType *var2, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer ) {
+
+                auto class1 = internal_lookup( var1->get_name() );
+                auto class2 = internal_lookup( var2->get_name() );
+
+                // exit early if variables already bound together
+                if ( class1 != env.end() && class1 == class2 ) {
+                        class1->allowWidening &= widenMode;
+                        return true;
+                }
+
+                bool widen1 = false, widen2 = false;
+                const Type *type1 = nullptr, *type2 = nullptr;
+
+                // check for existing bindings, perform occurs check
+                if ( class1 != env.end() ) {
+                        if ( class1->type ) {
+                                if ( occurs( class1->type, var2->get_name(), *this ) ) return false;
+                                type1 = class1->type;
+                        } // if
+                        widen1 = widenMode.widenFirst && class1->allowWidening;
+                } // if
+                if ( class2 != env.end() ) {
+                        if ( class2->type ) {
+                                if ( occurs( class2->type, var1->get_name(), *this ) ) return false;
+                                type2 = class2->type;
+                        } // if
+                        widen2 = widenMode.widenSecond && class2->allowWidening;
+                } // if
+
+                if ( type1 && type2 ) {
+                        // both classes bound, merge if bound types can be unified
+                        std::unique_ptr<Type> newType1{ type1->clone() }, newType2{ type2->clone() };
+                        WidenMode newWidenMode{ widen1, widen2 };
+                        Type *common = 0;
+                        if ( unifyInexact( newType1.get(), newType2.get(), *this, need, have, openVars, newWidenMode, indexer, common ) ) {
+                                class1->vars.insert( class2->vars.begin(), class2->vars.end() );
+                                class1->allowWidening = widen1 && widen2;
+                                if ( common ) {
+                                        common->get_qualifiers() = Type::Qualifiers{};
+                                        class1->set_type( common );
+                                }
+                                env.erase( class2 );
+                        } else return false;
+                } else if ( class1 != env.end() && class2 != env.end() ) {
+                        // both classes exist, at least one unbound, merge unconditionally
+                        if ( type1 ) {
+                                class1->vars.insert( class2->vars.begin(), class2->vars.end() );
+                                class1->allowWidening = widen1;
+                                env.erase( class2 );
+                        } else {
+                                class2->vars.insert( class1->vars.begin(), class1->vars.end() );
+                                class2->allowWidening = widen2;
+                                env.erase( class1 );
+                        } // if
+                } else if ( class1 != env.end() ) {
+                        // var2 unbound, add to class1
+                        class1->vars.insert( var2->get_name() );
+                        class1->allowWidening = widen1;
+                } else if ( class2 != env.end() ) {
+                        // var1 unbound, add to class2
+                        class2->vars.insert( var1->get_name() );
+                        class2->allowWidening = widen2;
+                } else {
+                        // neither var bound, create new class
+                        EqvClass newClass;
+                        newClass.vars.insert( var1->get_name() );
+                        newClass.vars.insert( var2->get_name() );
+                        newClass.allowWidening = widen1 && widen2;
+                        newClass.data = data;
+                        env.push_back( std::move(newClass) );
+                } // if
+                return true;
+        }
+
+        void TypeEnvironment::forbidWidening() {
+                for ( EqvClass& c : env ) c.allowWidening = false;
+        }
+
         std::ostream & operator<<( std::ostream & out, const TypeEnvironment & env ) {
                 env.print( out );