Changeset 8f31be6 for src/ResolvExpr/Unify.cc

Timestamp:

Jul 6, 2023, 11:07:27 AM (15 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

b4d2b3b

Parents:

c8bf1b5

Message:

Fixed some warnings, deleted some commented out code.

File:

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

src/ResolvExpr/Unify.cc

@@ -1298 +1298 @@
                 auto var1 = dynamic_cast< const ast::TypeInstType * >( type1 );
                 auto var2 = dynamic_cast< const ast::TypeInstType * >( type2 );
-                ast::OpenVarSet::const_iterator
-                        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 = var1 && env.lookup(*var1);
                 bool isopen2 = var2 && env.lookup(*var2);
 
-                /*
-                if ( isopen1 && isopen2 ) {
-                        if ( entry1->second.kind != entry2->second.kind ) return false;
-                        return env.bindVarToVar(
-                                var1, var2, ast::TypeData{ entry1->second, entry2->second }, need, have,
-                                open, widen );
-                } else if ( isopen1 ) {
-                        return env.bindVar( var1, type2, entry1->second, need, have, open, widen );
-                } else if ( isopen2 ) {
-                        return env.bindVar( var2, type1, entry2->second, need, have, open, widen, symtab );
-                } */
                 if ( isopen1 && isopen2 ) {
                         if ( var1->base->kind != var2->base->kind ) return false;
@@ -1326 +1310 @@
                 } else if ( isopen2 ) {
                         return env.bindVar( var2, type1, ast::TypeData{var2->base}, need, have, open, widen );
-                }else {
+                } else {
                         return ast::Pass<Unify_new>::read(
                                 type1, type2, env, need, have, open, widen );
                 }
-                
         }