Changes in src/ResolvExpr/Unify.cc [54e41b3:d286cf68]

File:

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

src/ResolvExpr/Unify.cc

@@ -21 +21 @@
 #include <string>                 // for string, operator==, operator!=, bas...
 #include <utility>                // for pair, move
-#include <vector>
-
-#include "AST/Node.hpp"
-#include "AST/Type.hpp"
+
 #include "Common/PassVisitor.h"   // for PassVisitor
 #include "FindOpenVars.h"         // for findOpenVars
@@ -175 +172 @@
                 bool isopen2 = var2 && ( entry2 != openVars.end() );
 
-                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 );
-                        }
+                if ( isopen1 && isopen2 && entry1->second == entry2->second ) {
+                        result = env.bindVarToVar( var1, var2, entry1->second, needAssertions, haveAssertions, openVars, widenMode, indexer );
                 } else if ( isopen1 ) {
                         result = env.bindVar( var1, type2, entry1->second, needAssertions, haveAssertions, openVars, widenMode, indexer );
@@ -633 +624 @@
         }
 
+        // xxx - compute once and store in the FunctionType?
         Type * extractResultType( FunctionType * function ) {
                 if ( function->get_returnVals().size() == 0 ) {
@@ -646 +638 @@
                 }
         }
-
-        ast::ptr<ast::Type> extractResultType( const ast::FunctionType * func ) {
-                assert(!"restore after AST added to build");
-                // if ( func->returns.empty() ) return new ast::VoidType{};
-                // if ( func->returns.size() == 1 ) return func->returns[0]->get_type();
-
-                // std::vector<ast::ptr<ast::Type>> tys;
-                // for ( const ast::DeclWithType * decl : func->returns ) {
-                //      tys.emplace_back( decl->get_type() );
-                // }
-                // return new ast::TupleType{ std::move(tys) };
-        }
 } // namespace ResolvExpr