Changes in src/ResolvExpr/Unify.h [2773ab8:ea6332d]

File:

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

src/ResolvExpr/Unify.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 13:09:04 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Mon Jun 18 11:58:00 2018
-// Update Count     : 4
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 23:09:34 2017
+// Update Count     : 3
 //
 
@@ -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
 #include "SynTree/Declaration.h"  // for TypeDecl, TypeDecl::Data
 #include "TypeEnvironment.h"      // for AssertionSet, OpenVarSet
-#include "WidenMode.h"              // for WidenMode
 
 class Type;
 class TypeInstType;
 namespace SymTab {
-        class Indexer;
-}
-
-namespace ast {
-        class SymbolTable;
-        class Type;
-}
+class Indexer;
+}  // namespace SymTab
 
 namespace ResolvExpr {
+        struct WidenMode {
+                WidenMode( bool widenFirst, bool widenSecond ): widenFirst( widenFirst ), widenSecond( widenSecond ) {}
+                WidenMode &operator|=( const WidenMode &other ) { widenFirst |= other.widenFirst; widenSecond |= other.widenSecond; return *this; }
+                WidenMode &operator&=( const WidenMode &other ) { widenFirst &= other.widenFirst; widenSecond &= other.widenSecond; return *this; }
+                WidenMode operator|( const WidenMode &other ) { WidenMode newWM( *this ); newWM |= other; return newWM; }
+                WidenMode operator&( const WidenMode &other ) { WidenMode newWM( *this ); newWM &= other; return newWM; }
+                operator bool() { return widenFirst && widenSecond; }
+
+                bool widenFirst : 1, widenSecond : 1;
+        };
+
+        bool bindVar( TypeInstType *typeInst, Type *other, const TypeDecl::Data & data, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
         bool unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer );
         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 );
 
         template< typename Iterator1, typename Iterator2 >
@@ -69 +72 @@
         }
 
-        bool unify( 
-                const ast::ptr<ast::Type> & type1, const ast::ptr<ast::Type> & type2, 
-                ast::TypeEnvironment & env, ast::AssertionSet & need, ast::AssertionSet & have, 
-                ast::OpenVarSet & open, const ast::SymbolTable & symtab );
-
-        bool unify( 
-                const ast::ptr<ast::Type> & type1, const ast::ptr<ast::Type> & type2, 
-                ast::TypeEnvironment & env, ast::AssertionSet & need, ast::AssertionSet & have, 
-                ast::OpenVarSet & open, const ast::SymbolTable & symtab, ast::ptr<ast::Type> & common );
-
-        bool unifyExact( 
-                const ast::Type * type1, const ast::Type * type2, ast::TypeEnvironment & env, 
-                ast::AssertionSet & need, ast::AssertionSet & have, const ast::OpenVarSet & open, 
-                WidenMode widen, const ast::SymbolTable & symtab );
-
-        bool unifyInexact( 
-                const ast::ptr<ast::Type> & type1, const 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 );
-
 } // namespace ResolvExpr