Changeset 24d6572 for src/GenPoly/InstantiateGenericNew.cpp

Timestamp:

Jun 12, 2023, 2:45:32 PM (2 years 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/GenPoly/InstantiateGenericNew.cpp (modified) (2 diffs)

src/GenPoly/InstantiateGenericNew.cpp

@@ -32 +32 @@
 #include "GenPoly/GenPoly.h"           // for isPolyType, typesPolyCompatible
 #include "GenPoly/ScrubTyVars.h"       // for scrubAll
-#include "ResolvExpr/typeops.h"        // for typesCompatible
+#include "ResolvExpr/AdjustExprType.hpp"  // for adjustExprType
+#include "ResolvExpr/Unify.h"          // for typesCompatible
 
 namespace GenPoly {
@@ -361 +362 @@
                         ResolvExpr::typesCompatible(
                                 memberExpr->result,
-                                memberExpr->member->get_type(), ast::SymbolTable() ) ) {
+                                memberExpr->member->get_type() ) ) {
                 return memberExpr;
         }