Changeset 92538ab for src/ResolvExpr/CandidateFinder.hpp

Timestamp:

Apr 10, 2022, 2:53:18 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

File:

• src/ResolvExpr/CandidateFinder.hpp (modified) (3 diffs)

src/ResolvExpr/CandidateFinder.hpp

@@ -10 +10 @@
 // Created On       : Wed Jun 5 14:30:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Oct  1  9:51:00 2019
-// Update Count     : 2
+// Last Modified On : Wed Mar 16 15:22:00 2022
+// Update Count     : 3
 //
 
@@ -25 +25 @@
 namespace ResolvExpr {
 
+struct ResolveContext;
+
 /// Data to perform expression resolution
 struct CandidateFinder {
         CandidateList candidates;          ///< List of candidate resolutions
-        const ast::SymbolTable & localSyms;   ///< Symbol table to lookup candidates
+        const ResolveContext & context;  ///< Information about where the canditates are being found.
         const ast::TypeEnvironment & env;  ///< Substitutions performed in this resolution
         ast::ptr< ast::Type > targetType;  ///< Target type for resolution
@@ -34 +36 @@
 
         CandidateFinder(
-                const ast::SymbolTable & syms, const ast::TypeEnvironment & env,
+                const ResolveContext & context, const ast::TypeEnvironment & env,
                 const ast::Type * tt = nullptr )
-        : candidates(), localSyms( syms ), env( env ), targetType( tt ) {}
+        : candidates(), context( context ), env( env ), targetType( tt ) {}
 
         /// Fill candidates with feasible resolutions for `expr`