diff --git a/src/library/blast/simplifier.cpp b/src/library/blast/simplifier.cpp index 5fae1e9a2..fad839bbd 100644 --- a/src/library/blast/simplifier.cpp +++ b/src/library/blast/simplifier.cpp @@ -113,8 +113,9 @@ class simplifier { bool m_trace{get_simplify_trace()}; /* Cache */ - typedef expr_bi_struct_map simplify_cache; - std::map m_simplify_cache; + typedef expr_bi_struct_map simplify_cache; + typedef std::map simplify_caches; + simplify_caches m_simplify_caches; optional cache_lookup(expr const & e); void cache_save(expr const & e, result const & r); @@ -168,13 +169,13 @@ simplifier::simplifier(branch const & b, name const & rel): /* Cache */ optional simplifier::cache_lookup(expr const & e) { - simplify_cache & cache = m_simplify_cache[m_rel]; + simplify_cache & cache = m_simplify_caches[m_rel]; auto it = cache.find(e); if (it != cache.end()) return optional(it->second); return optional(); } void simplifier::cache_save(expr const & e, result const & r) { - simplify_cache & cache = m_simplify_cache[m_rel]; + simplify_cache & cache = m_simplify_caches[m_rel]; cache.insert(mk_pair(e,r)); } @@ -237,7 +238,7 @@ result simplifier::simplify(expr const & e) { flet inc_depth(m_depth, m_depth+1); if (m_trace) { - ios().get_diagnostic_channel() << m_depth << "." << m_rel << ": " << e << "\n"; + ios().get_diagnostic_channel() << m_depth << "." << m_rel << "." << m_local_ctx << " " << e << "\n"; } if (m_num_steps > m_max_steps) @@ -530,7 +531,7 @@ result simplifier::try_congr(expr const & e, congr_rule const & cr) { while (is_pi(m_type)) { expr d = instantiate_rev(binding_domain(m_type), ls.size(), ls.data()); expr l = tmp_tctx->mk_tmp_local(d,binding_info(e)); - ls.push_back(l); + ls.push_back(tmp_tctx->instantiate_uvars_mvars(l)); m_type = instantiate(binding_body(m_type),l); } @@ -539,7 +540,10 @@ result simplifier::try_congr(expr const & e, congr_rule const & cr) { lean_assert(valid); { flet set_name(m_rel,const_name(h_rel)); - flet> set_local_ctx(m_local_ctx,to_list(ls)); + flet > set_local_ctx(m_local_ctx,append(m_local_ctx,to_list(ls))); + simplify_caches fresh_caches; + flet set_simplify_caches(m_simplify_caches,fresh_caches); + h_lhs = tmp_tctx->instantiate_uvars_mvars(h_lhs); result r_congr_hyp = simplify(h_lhs); expr hyp;