Changeset 46da46b for src/ResolvExpr/Unify.cc

Timestamp:

May 2, 2023, 3:44:31 AM (16 months ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ast-experimental, master

Children:

0c840fc

Parents:

1ab773e0

Message:

current progress

File:

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

src/ResolvExpr/Unify.cc

@@ -134 +134 @@
                 env.apply( newSecond );
 
-                findOpenVars( newFirst, open, closed, need, have, FirstClosed );
-                findOpenVars( newSecond, open, closed, need, have, FirstOpen );
+                // findOpenVars( newFirst, open, closed, need, have, FirstClosed );
+                findOpenVars( newSecond, open, closed, need, have, newEnv, FirstOpen );
 
                 return unifyExact(newFirst, newSecond, newEnv, need, have, open, noWiden(), symtab );
@@ -1029 +1029 @@
 
                 void postvisit( const ast::TypeInstType * typeInst ) {
-                        assert( open.find( *typeInst ) == open.end() );
+                        // assert( open.find( *typeInst ) == open.end() );
                         handleRefType( typeInst, type2 );
                 }
@@ -1142 +1142 @@
         ) {
                 ast::OpenVarSet closed;
-                findOpenVars( type1, open, closed, need, have, FirstClosed );
-                findOpenVars( type2, open, closed, need, have, FirstOpen );
+                // findOpenVars( type1, open, closed, need, have, FirstClosed );
+                findOpenVars( type2, open, closed, need, have, env, FirstOpen );
                 return unifyInexact(
                         type1, type2, env, need, have, open, WidenMode{ true, true }, symtab, common );
@@ -1160 +1160 @@
                         entry1 = var1 ? open.find( *var1 ) : open.end(),
                         entry2 = var2 ? open.find( *var2 ) : open.end();
-                bool isopen1 = entry1 != open.end();
-                bool isopen2 = entry2 != open.end();
-
+                // bool isopen1 = entry1 != open.end();
+                // bool isopen2 = entry2 != open.end();
+                bool isopen1 = var1 && env.lookup(*var1);
+                bool isopen2 = var2 && env.lookup(*var2);
+
+                /*
                 if ( isopen1 && isopen2 ) {
                         if ( entry1->second.kind != entry2->second.kind ) return false;
@@ -1172 +1175 @@
                 } else if ( isopen2 ) {
                         return env.bindVar( var2, type1, entry2->second, need, have, open, widen, symtab );
-                } else {
+                } */
+                if ( isopen1 && isopen2 ) {
+                        if ( var1->base->kind != var2->base->kind ) return false;
+                        return env.bindVarToVar(
+                                var1, var2, ast::TypeData{ var1->base->kind, var1->base->sized||var2->base->sized }, need, have,
+                                open, widen, symtab );
+                } else if ( isopen1 ) {
+                        return env.bindVar( var1, type2, ast::TypeData{var1->base}, need, have, open, widen, symtab );
+                } else if ( isopen2 ) {
+                        return env.bindVar( var2, type1, ast::TypeData{var2->base}, need, have, open, widen, symtab );
+                }else {
                         return ast::Pass<Unify_new>::read(
                                 type1, type2, env, need, have, open, widen, symtab );
                 }
+                
         }