Changeset 9ea38de for src/ResolvExpr/CandidateFinder.cpp
- Timestamp:
- Jun 25, 2019, 11:26:30 AM (5 years ago)
- Branches:
- ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
- Children:
- bcb311b
- Parents:
- 28af389
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/ResolvExpr/CandidateFinder.cpp
r28af389 r9ea38de 594 594 595 595 /// Actually visits expressions to find their candidate interpretations 596 struct Finder final : public ast::WithShortCircuiting { 596 class Finder final : public ast::WithShortCircuiting { 597 const ast::SymbolTable & symtab; 598 public: 597 599 CandidateFinder & selfFinder; 598 const ast::SymbolTable & symtab;599 600 CandidateList & candidates; 600 601 const ast::TypeEnvironment & tenv; … … 602 603 603 604 Finder( CandidateFinder & f ) 604 : s elfFinder( f ), symtab( f.symtab), candidates( f.candidates ), tenv( f.env ),605 : symtab( f.localSyms ), selfFinder( f ), candidates( f.candidates ), tenv( f.env ), 605 606 targetType( f.targetType ) {} 606 607 … … 1558 1559 std::vector< std::string > errors; 1559 1560 for ( CandidateRef & candidate : candidates ) { 1560 satisfyAssertions( candidate, symtab, satisfied, errors );1561 satisfyAssertions( candidate, localSyms, satisfied, errors ); 1561 1562 } 1562 1563 … … 1613 1614 r->expr = ast::mutate_field( 1614 1615 r->expr.get(), &ast::Expr::result, 1615 adjustExprType( r->expr->result, r->env, symtab) );1616 adjustExprType( r->expr->result, r->env, localSyms ) ); 1616 1617 } 1617 1618 } … … 1631 1632 1632 1633 for ( const auto & x : xs ) { 1633 out.emplace_back( symtab, env );1634 out.emplace_back( localSyms, env ); 1634 1635 out.back().find( x, ResolvMode::withAdjustment() ); 1635 1636
Note: See TracChangeset
for help on using the changeset viewer.