Changeset b21c77a for src/ResolvExpr/TypeEnvironment.h

Timestamp:

Jun 29, 2018, 4:14:15 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env

Children:

184557e

Parents:

97397a26 (diff), 28f3a19 (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 remote-tracking branch 'origin/with_gc' into new-env

File:

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

src/ResolvExpr/TypeEnvironment.h

@@ -10 +10 @@
 // Created On       : Sun May 17 12:24:58 2015
 // Last Modified By : Aaron B. Moss
-// Last Modified On : Wed Jun 13 16:31:00 2018
-// Update Count     : 4
+// Last Modified On : Fri Jun 29 16:00:00 2018
+// Update Count     : 5
 //
 
@@ -24 +24 @@
 #include <utility>                         // for pair
 #include <vector>                          // for vector
+
+#include "WidenMode.h"                 // for WidenMode
 
 #include "Common/InternedString.h"         // for interned_string
@@ -95 +97 @@
 
                 void initialize( const EqvClass &src, EqvClass &dest );
+                void initialize( const EqvClass &src, EqvClass &dest, const Type *ty );
                 EqvClass();
-                EqvClass( std::vector<interned_string>&& vars, BoundType&& bound );
                 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;
-        };
-#endif
-
+
+                /// Takes ownership of `ty`, freeing old `type`
+                void set_type(Type* ty);
+        };
+#endif
+        
         class TypeEnvironment;
 
@@ -206 +214 @@
                         WidenMode widenMode, const SymTab::Indexer& indexer );
 #if !1
-                void add( const EqvClass &eqvClass );
-                void add( EqvClass &&eqvClass  );
+        private:
+                void add( EqvClass &&eqvClass );
+        public:
                 void add( const Type::ForallList &tyDecls );
                 void add( const TypeSubstitution & sub );
@@ -226 +235 @@
                 /// and extracts open variables.
                 void addActual( const TypeEnvironment& actualEnv, OpenVarSet& openVars );
+
+                /// Disallows widening for all bindings in the environment
+                void forbidWidening();
 #endif
 
                 iterator begin() { return { this, bindings->begin() }; }
                 iterator end() { return { this, bindings->end() }; }
-#if 0
-                typedef std::list< EqvClass >::const_iterator const_iterator;
-                const_iterator begin() const { return env.begin(); }
-                const_iterator end() const { return env.end(); }
-#endif
         };