Changeset 28f3a19 for src/ResolvExpr/TypeEnvironment.h

Timestamp:

Jun 27, 2018, 3:28:41 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

b21c77a

Parents:

0182bfa (diff), 63238a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into with_gc

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 : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:35:45 2017
-// Update Count     : 3
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Mon Jun 18 11:58:00 2018
+// Update Count     : 4
 //
 
@@ -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...
@@ -77 +80 @@
 
                 void initialize( const EqvClass &src, EqvClass &dest );
+                void initialize( const EqvClass &src, EqvClass &dest, const Type *ty );
                 EqvClass();
                 EqvClass( const EqvClass &other );
+                EqvClass( const EqvClass &other, const Type *ty );
+                EqvClass( EqvClass &&other );
                 EqvClass &operator=( const EqvClass &other );
+                EqvClass &operator=( EqvClass &&other );
                 void print( std::ostream &os, Indenter indent = {} ) const;
+
+                /// Takes ownership of `ty`, freeing old `type`
+                void set_type(Type* ty);
         };
 
@@ -86 +96 @@
           public:
                 const EqvClass* lookup( const std::string &var ) const;
-                void add( const EqvClass &eqvClass );
+          private:
                 void add( EqvClass &&eqvClass  );
+          public:
                 void add( const Type::ForallList &tyDecls );
                 void add( const TypeSubstitution & sub );
@@ -95 +106 @@
                 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;
@@ -104 +115 @@
                 void addActual( const TypeEnvironment& actualEnv, OpenVarSet& openVars );
 
-                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(); }
+                /// 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(); }
+
           private:
                 std::list< EqvClass > env;
+                
                 std::list< EqvClass >::iterator internal_lookup( const std::string &var );
         };