Changeset 1a59641 for src/ResolvExpr/TypeEnvironment.h

Timestamp:

Jul 27, 2018, 2:41:34 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env

Children:

6fa409e

Parents:

5a3e1f1

Message:

Fix open var handling in BF assn resolution; memory usage reasonable again

File:

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

src/ResolvExpr/TypeEnvironment.h

@@ -78 +78 @@
         typedef std::map< std::string, TypeDecl::Data > OpenVarSet;
 
+        /// merges one set of open vars into another
+        static inline void mergeOpenVars( OpenVarSet& dst, const OpenVarSet& src ) {
+                for ( const auto& entry : src ) { dst[ entry.first ] = entry.second; }
+        }
+
         void printAssertionSet( const AssertionSet &, std::ostream &, int indent = 0 );
         void printOpenVarSet( const OpenVarSet &, std::ostream &, int indent = 0 );
@@ -138 +143 @@
         };
 
+        //#define EXPENSIVE_ENV_VALIDATION
+        #ifdef EXPENSIVE_ENV_VALIDATION
         class ValidateGuard;
+        #endif
 
         class TypeEnvironment {
@@ -156 +164 @@
                 Bindings* bindings;
 
-                // for debugging
+                #ifdef EXPENSIVE_ENV_VALIDATION
+                /// for debugging
                 friend ValidateGuard;
                 const char* last_fn = "<none>";
+                #endif
 
                 /// Merges the classes rooted at root1 and root2, returning a pair containing the root and 
@@ -225 +235 @@
                 /// from the same initial environment.
                 /// Returns false if unsuccessful, but does NOT roll back partial changes
-                bool combine( const TypeEnvironment& o, const SymTab::Indexer& indexer );
+                bool combine( const TypeEnvironment& o, OpenVarSet& openVars, 
+                        const SymTab::Indexer& indexer );
         
                 void extractOpenVars( OpenVarSet &openVars ) const;