Changes in src/ResolvExpr/Unify.cc [c77fd8b:0b150ec]

File:

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

src/ResolvExpr/Unify.cc

@@ -114 +114 @@
         }
 
-        bool isFtype( Type *type ) {
+        bool isFtype( Type *type, const SymTab::Indexer &indexer ) {
                 if ( dynamic_cast< FunctionType* >( type ) ) {
                         return true;
@@ -123 +123 @@
         }
 
-        bool tyVarCompatible( const TypeDecl::Data & data, Type *type ) {
+        bool tyVarCompatible( const TypeDecl::Data & data, Type *type, const SymTab::Indexer &indexer ) {
                 switch ( data.kind ) {
                   case TypeDecl::Any:
@@ -131 +131 @@
                         // 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() );
+                        return ! isFtype( type, indexer ) && (! data.isComplete || type->isComplete() );
                   case TypeDecl::Ftype:
-                        return isFtype( type );
+                        return isFtype( type, indexer );
                   case TypeDecl::Ttype:
                         // ttype unifies with any tuple type
@@ -144 +144 @@
                 OpenVarSet::const_iterator tyvar = openVars.find( typeInst->get_name() );
                 assert( tyvar != openVars.end() );
-                if ( ! tyVarCompatible( tyvar->second, other ) ) {
+                if ( ! tyVarCompatible( tyvar->second, other, indexer ) ) {
                         return false;
                 } // if
@@ -388 +388 @@
         }
 
-        void Unify::visit( __attribute__((unused)) VoidType *voidType) {
+        void Unify::visit(VoidType *voidType) {
                 result = dynamic_cast< VoidType* >( type2 );
         }
@@ -683 +683 @@
 
         template< typename Iterator1, typename Iterator2 >
-        bool unifyList( Iterator1 list1Begin, Iterator1 list1End, Iterator2 list2Begin, Iterator2 list2End, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, const SymTab::Indexer &indexer ) {
+        bool unifyList( Iterator1 list1Begin, Iterator1 list1End, Iterator2 list2Begin, Iterator2 list2End, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer ) {
                 auto get_type = [](Type * t) { return t; };
                 for ( ; list1Begin != list1End && list2Begin != list2End; ++list1Begin, ++list2Begin ) {
@@ -733 +733 @@
                         flatten( flat2.get(), back_inserter( types2 ) );
 
-                        result = unifyList( types1.begin(), types1.end(), types2.begin(), types2.end(), env, needAssertions, haveAssertions, openVars, indexer );
-                } // if
-        }
-
-        void Unify::visit( __attribute__((unused)) VarArgsType *varArgsType ) {
+                        result = unifyList( types1.begin(), types1.end(), types2.begin(), types2.end(), env, needAssertions, haveAssertions, openVars, widenMode, indexer );
+                } // if
+        }
+
+        void Unify::visit(VarArgsType *varArgsType) {
                 result = dynamic_cast< VarArgsType* >( type2 );
         }
 
-        void Unify::visit( __attribute__((unused)) ZeroType *zeroType ) {
+        void Unify::visit(ZeroType *zeroType) {
                 result = dynamic_cast< ZeroType* >( type2 );
         }
 
-        void Unify::visit( __attribute__((unused)) OneType *oneType ) {
+        void Unify::visit(OneType *oneType) {
                 result = dynamic_cast< OneType* >( type2 );
         }