Changes in src/ResolvExpr/Unify.h [f474e91:d76c588]

File:

• src/ResolvExpr/Unify.h (modified) (3 diffs)

src/ResolvExpr/Unify.h

@@ -18 +18 @@
 #include <list>                   // for list
 
-#include "AST/Node.hpp"             // for ptr
 #include "AST/TypeEnvironment.hpp"  // for TypeEnvironment, AssertionSet, OpenVarSet
 #include "Common/utility.h"       // for deleteAll
@@ -40 +39 @@
         bool unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer, Type *&commonType );
         bool unifyExact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer );
-        bool unifyInexact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer, Type *&common );
+        bool unifyInexact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer, Type *&common );
 
         template< typename Iterator1, typename Iterator2 >
@@ -69 +68 @@
         }
 
-        bool unifyExact( 
+        bool unifyInexact( 
                 const ast::Type * type1, const ast::Type * type2, ast::TypeEnvironment & env, 
-                ast::AssertionSet & need, ast::AssertionSet & have, ast::OpenVarSet & open, 
-                const ast::SymbolTable & symtab );
-
-        bool unifyInexact( 
-                ast::ptr<ast::Type> & type1, ast::ptr<ast::Type> & type2, ast::TypeEnvironment & env, 
-                ast::AssertionSet & need, ast::AssertionSet & have, const ast::OpenVarSet & open, 
-                WidenMode widen, const ast::SymbolTable & symtab, ast::ptr<ast::Type> & common );
+                ast::AssertionSet & need, ast::AssertionSet & have, const ast::OpenVarSet & openVars, 
+                WidenMode widenMode, const ast::SymbolTable & symtab, const ast::Type *& common );
 
 } // namespace ResolvExpr