Changeset 251ce80 for src/ResolvExpr/SatisfyAssertions.cpp

Timestamp:

Jun 1, 2023, 6:29:47 PM (14 months ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ast-experimental, master

Children:

24d6572, ded6c2a6

Parents:

1803d4d

Message:

remove reference to symbol table in unify

File:

• src/ResolvExpr/SatisfyAssertions.cpp (modified) (3 diffs)

src/ResolvExpr/SatisfyAssertions.cpp

@@ -215 +215 @@
                         findOpenVars( adjType, newOpen, closed, newNeed, have, FirstOpen );
                         if ( allowConversion ) {
-                                if ( auto c = commonType( toType, adjType, newEnv, newNeed, have, newOpen, WidenMode {true, true}, sat.symtab ) ) {
+                                if ( auto c = commonType( toType, adjType, newEnv, newNeed, have, newOpen, WidenMode {true, true} ) ) {
                                         // set up binding slot for recursive assertions
                                         ast::UniqueId crntResnSlot = 0;
@@ -229 +229 @@
                         }
                         else {
-                                if ( unifyExact( toType, adjType, newEnv, newNeed, have, newOpen, WidenMode {true, true}, sat.symtab ) ) {
+                                if ( unifyExact( toType, adjType, newEnv, newNeed, have, newOpen, WidenMode {true, true} ) ) {
                                         // set up binding slot for recursive assertions
                                         ast::UniqueId crntResnSlot = 0;
@@ -392 +392 @@
                         mergeOpenVars( open, i.match.open );
 
-                        if ( ! env.combine( i.match.env, open, symtab ) ) return false;
+                        if ( ! env.combine( i.match.env, open ) ) return false;
 
                         crnt.emplace_back( i );