Changeset 7a63486 for src/ResolvExpr/Unify.cc

Timestamp:

Apr 10, 2019, 3:15:41 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

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, stuck-waitfor-destruct

Children:

055b562

Parents:

c41c18a6

Message:

Allow merging between complete/incomplete type variables

File:

• src/ResolvExpr/Unify.cc (modified) (1 diff)

src/ResolvExpr/Unify.cc

@@ -172 +172 @@
                 bool isopen2 = var2 && ( entry2 != openVars.end() );
 
-                if ( isopen1 && isopen2 && entry1->second == entry2->second ) {
-                        result = env.bindVarToVar( var1, var2, entry1->second, needAssertions, haveAssertions, openVars, widenMode, indexer );
+                if ( isopen1 && isopen2 ) {
+                        if ( entry1->second.kind != entry2->second.kind ) {
+                                result = false;
+                        } else {
+                                result = env.bindVarToVar( 
+                                        var1, var2, TypeDecl::Data{ entry1->second, entry2->second }, needAssertions, 
+                                        haveAssertions, openVars, widenMode, indexer );
+                        }
                 } else if ( isopen1 ) {
                         result = env.bindVar( var1, type2, entry1->second, needAssertions, haveAssertions, openVars, widenMode, indexer );