Changes in src/ResolvExpr/Unify.cc [721f17a:eb50842]

File:

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

src/ResolvExpr/Unify.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 12:27:10 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 26 14:57:05 2015
-// Update Count     : 7
+// Last Modified On : Sun May 17 13:08:48 2015
+// Update Count     : 6
 //
 
@@ -73 +73 @@
         };
 
+        /// Attempts an inexact unification of type1 and type2.
+        /// Returns false if no such unification; if the types can be unified, sets common (unless they unify exactly and have identical type qualifiers)
         bool unifyInexact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer, Type *&common );
         bool unifyExact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
@@ -148 +150 @@
                         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::auto_ptr< Type > newType( curClass.type->clone() );
                                 newType->get_qualifiers() = typeInst->get_qualifiers();
@@ -280 +283 @@
                 TypeEnvironment debugEnv( env );
 #endif
+                if ( type1->get_qualifiers() != type2->get_qualifiers() ) {
+                        return false;
+                }
+
                 bool result;
                 TypeInstType *var1 = dynamic_cast< TypeInstType* >( type1 );
@@ -292 +299 @@
                 bool isopen1 = var1 && ( entry1 != openVars.end() );
                 bool isopen2 = var2 && ( entry2 != openVars.end() );
-                if ( type1->get_qualifiers() != type2->get_qualifiers() ) {
-                        return false;
-                } else if ( isopen1 && isopen2 && entry1->second == entry2->second ) {
+
+                if ( isopen1 && isopen2 && entry1->second == entry2->second ) {
                         result = bindVarToVar( var1, var2, entry1->second, env, needAssertions, haveAssertions, openVars, widenMode, indexer );
                 } else if ( isopen1 ) {