Changes in src/ResolvExpr/Unify.cc [982f95d:8e18b8e]

File:

• src/ResolvExpr/Unify.cc (modified) (3 diffs)

src/ResolvExpr/Unify.cc

@@ -31 +31 @@
 #include "SynTree/Visitor.h"      // for Visitor
 #include "Tuples/Tuples.h"        // for isTtype
-#include "TypeEnvironment.h"      // for ClassRef, AssertionSet, OpenVarSet
+#include "TypeEnvironment.h"      // for EqvClass, AssertionSet, OpenVarSet
 #include "Unify.h"
 #include "typeops.h"              // for flatten, occurs, commonType
@@ -128 +128 @@
                         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 );
+                } // switch
                 return false;
         }
@@ -508 +525 @@
                 void premutate( TypeInstType * ) { visit_children = false; }
                 Type * postmutate( TypeInstType * typeInst ) {
-                        if ( ClassRef eqvClass = tenv.lookup( typeInst->get_name() ) ) {
+                        if ( const EqvClass *eqvClass = tenv.lookup( typeInst->get_name() ) ) {
                                 // expand ttype parameter into its actual type
-                                BoundType cBound = eqvClass.get_bound();
-                                if ( cBound.data.kind == TypeDecl::Ttype && cBound.type ) {
-                                        return cBound.type->clone();
+                                if ( eqvClass->data.kind == TypeDecl::Ttype && eqvClass->type ) {
+                                        return eqvClass->type->clone();
                                 }
                         }