Changes in src/ResolvExpr/TypeEnvironment.h [d286cf68:00ac42e]

File:

• src/ResolvExpr/TypeEnvironment.h (modified) (6 diffs)

src/ResolvExpr/TypeEnvironment.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:24:58 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 : Sat Jul 22 09:35:45 2017
+// Update Count     : 3
 //
 
@@ -21 +21 @@
 #include <set>                         // for set
 #include <string>                      // for string
-#include <utility>                     // for move, swap
-
-#include "WidenMode.h"                 // for WidenMode
 
 #include "SynTree/Declaration.h"       // for TypeDecl::Data, DeclarationWit...
@@ -80 +77 @@
                 EqvClass( const EqvClass &other );
                 EqvClass( const EqvClass &other, const Type *ty );
-                EqvClass( EqvClass &&other );
                 EqvClass &operator=( const EqvClass &other );
-                EqvClass &operator=( EqvClass &&other );
                 ~EqvClass();
                 void print( std::ostream &os, Indenter indent = {} ) const;
-
-                /// Takes ownership of `ty`, freeing old `type`
-                void set_type(Type* ty);
         };
 
@@ -93 +85 @@
           public:
                 const EqvClass* lookup( const std::string &var ) const;
-          private:
+                void add( const EqvClass &eqvClass );
                 void add( EqvClass &&eqvClass  );
-          public:
                 void add( const Type::ForallList &tyDecls );
                 void add( const TypeSubstitution & sub );
@@ -103 +94 @@
                 bool isEmpty() const { return env.empty(); }
                 void print( std::ostream &os, Indenter indent = {} ) const;
-                // void combine( const TypeEnvironment &second, Type *(*combineFunc)( Type*, Type* ) );
+                void combine( const TypeEnvironment &second, Type *(*combineFunc)( Type*, Type* ) );
                 void simpleCombine( const TypeEnvironment &second );
                 void extractOpenVars( OpenVarSet &openVars ) const;
@@ -112 +103 @@
                 void addActual( const TypeEnvironment& actualEnv, OpenVarSet& openVars );
 
-                /// Binds the type class represented by `typeInst` to the type `bindTo`; will add 
-                /// the class if needed. Returns false on failure.
-                bool bindVar( TypeInstType *typeInst, Type *bindTo, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
-                
-                /// Binds the type classes represented by `var1` and `var2` together; will add 
-                /// one or both classes if needed. Returns false on failure.
-                bool bindVarToVar( TypeInstType *var1, TypeInstType *var2, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
-
-                /// Disallows widening for all bindings in the environment
-                void forbidWidening();
-
-                using iterator = std::list< EqvClass >::const_iterator;
-                iterator begin() const { return env.begin(); }
-                iterator end() const { return env.end(); }
-
+                typedef std::list< EqvClass >::iterator iterator;
+                iterator begin() { return env.begin(); }
+                iterator end() { return env.end(); }
+                typedef std::list< EqvClass >::const_iterator const_iterator;
+                const_iterator begin() const { return env.begin(); }
+                const_iterator end() const { return env.end(); }
           private:
                 std::list< EqvClass > env;
-                
                 std::list< EqvClass >::iterator internal_lookup( const std::string &var );
         };