Changeset f89a111 for src/ResolvExpr/TypeEnvironment.h

Timestamp:

Jul 20, 2018, 4:50:02 PM (4 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env

Children:

9160cb2

Parents:

eff03a94

git-author:

Aaron Moss <a3moss@…> (07/20/18 16:43:03)

git-committer:

Aaron Moss <a3moss@…> (07/20/18 16:50:02)

Message:

Ported combine function into new environment

File:

• src/ResolvExpr/TypeEnvironment.h (modified) (1 diff)

src/ResolvExpr/TypeEnvironment.h

@@ -221 +221 @@
                 /// Caller should ensure environments do not share type variables.
                 void simpleCombine( const TypeEnvironment &second );
+
+                /// Combines two environments, checking compatibility. Both environments must be versioned 
+                /// 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 );
         
                 void extractOpenVars( OpenVarSet &openVars ) const;