Changeset 24d6572 for src/ResolvExpr/SatisfyAssertions.cpp

Timestamp:

Jun 12, 2023, 2:45:32 PM (14 months ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ast-experimental, master

Children:

62d62db

Parents:

34b4268 (diff), 251ce80 (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 ast-experimental

File:

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

src/ResolvExpr/SatisfyAssertions.cpp

@@ -24 +24 @@
 #include <vector>
 
+#include "AdjustExprType.hpp"
 #include "Candidate.hpp"
 #include "CandidateFinder.hpp"
+#include "CommonType.hpp"
 #include "Cost.h"
 #include "RenameVars.h"
+#include "SpecCost.hpp"
 #include "typeops.h"
 #include "Unify.h"
@@ -181 +184 @@
                                 .strict_as<ast::FunctionType>()->params[0]
                                 .strict_as<ast::ReferenceType>()->base;
-                        sat.cand->env.apply(thisArgType);
+                        // sat.cand->env.apply(thisArgType);
+
+                        if (auto inst = thisArgType.as<ast::TypeInstType>()) {
+                                auto cls = sat.cand->env.lookup(*inst);
+                                if (cls && cls->bound) thisArgType = cls->bound;
+                        }
 
                         std::string otypeKey = "";
@@ -218 +226 @@
                         ast::TypeEnvironment tempNewEnv {newEnv};
 
-                        if ( unifyExact( toType, adjType, tempNewEnv, newNeed, have, newOpen, WidenMode {true, true}, sat.symtab ) ) {
+                        if ( unifyExact( toType, adjType, tempNewEnv, newNeed, have, newOpen, WidenMode {true, true} ) ) {
                                 // set up binding slot for recursive assertions
                                 ast::UniqueId crntResnSlot = 0;
@@ -234 +242 @@
                                 // newEnv = sat.cand->env;
                                 // newNeed.clear();
-                                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;
@@ -398 +406 @@
                         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 );