Changes in src/ResolvExpr/Unify.cc [5bf3976:93c10de]

File:

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

src/ResolvExpr/Unify.cc

@@ -33 +33 @@
 #include "AST/TypeEnvironment.hpp"
 #include "Common/PassVisitor.h"     // for PassVisitor
-#include "CommonType.hpp"           // for commonType
 #include "FindOpenVars.h"           // for findOpenVars
-#include "SpecCost.hpp"             // for SpecCost
 #include "SynTree/LinkageSpec.h"    // for C
 #include "SynTree/Constant.h"       // for Constant
@@ -45 +43 @@
 #include "Tuples/Tuples.h"          // for isTtype
 #include "TypeEnvironment.h"        // for EqvClass, AssertionSet, OpenVarSet
-#include "typeops.h"                // for flatten, occurs
+#include "typeops.h"                // for flatten, occurs, commonType
 
 namespace ast {
@@ -52 +50 @@
 
 namespace SymTab {
-        class Indexer;
+class Indexer;
 }  // namespace SymTab
 
@@ -58 +56 @@
 
 namespace ResolvExpr {
-
-// Template Helpers:
-template< typename Iterator1, typename Iterator2 >
-bool unifyList( Iterator1 list1Begin, Iterator1 list1End, Iterator2 list2Begin, Iterator2 list2End, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer, std::list< Type* > &commonTypes ) {
-        for ( ; list1Begin != list1End && list2Begin != list2End; ++list1Begin, ++list2Begin ) {
-                Type *commonType = 0;
-                if ( ! unify( *list1Begin, *list2Begin, env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
-                        return false;
-                } // if
-                commonTypes.push_back( commonType );
-        } // for
-        return ( list1Begin == list1End && list2Begin == list2End );
-}
-
-template< typename Iterator1, typename Iterator2 >
-bool unifyList( Iterator1 list1Begin, Iterator1 list1End, Iterator2 list2Begin, Iterator2 list2End, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer ) {
-        std::list< Type* > commonTypes;
-        if ( unifyList( list1Begin, list1End, list2Begin, list2End, env, needAssertions, haveAssertions,  openVars, indexer, commonTypes ) ) {
-                deleteAll( commonTypes );
-                return true;
-        } else {
-                return false;
-        } // if
-}
 
         struct Unify_old : public WithShortCircuiting {