diff --git a/src/frontends/lean/elaborator.cpp b/src/frontends/lean/elaborator.cpp index 60e4cd47e..32f32cb75 100644 --- a/src/frontends/lean/elaborator.cpp +++ b/src/frontends/lean/elaborator.cpp @@ -307,9 +307,9 @@ class elaborator { substitution subst = next->first.get_subst(); buffer cs; expr const & mvar = get_app_fn(m_meta); - cs.push_back(mk_eq_cnstr(mvar, subst.instantiate(mvar), m_jst)); + cs.push_back(mk_eq_cnstr(mvar, subst.d_instantiate(mvar), m_jst)); for (auto const & mvar : m_mvars_in_meta_type) - cs.push_back(mk_eq_cnstr(mvar, subst.instantiate(mvar), m_jst)); + cs.push_back(mk_eq_cnstr(mvar, subst.d_instantiate(mvar), m_jst)); return optional(to_list(cs.begin(), cs.end())); } return optional(); @@ -424,7 +424,7 @@ public: \remark We update \c m_accumulated with any justifications used. */ expr instantiate_metavars(expr const & e) { - auto e_j = m_subst.instantiate_metavars(e); + auto e_j = m_subst.d_instantiate_metavars(e); m_accumulated = mk_composite1(m_accumulated, e_j.second); return e_j.first; } @@ -1128,7 +1128,7 @@ public: /** \brief Apply substitution and solve remaining metavariables using tactics. */ expr apply(substitution & s, expr const & e, name_set & univ_params, buffer & new_params) { - expr r = s.instantiate(e); + expr r = s.d_instantiate(e); if (has_univ_metavar(r)) r = univ_metavars_to_params_fn(m_env, m_lls, s, univ_params, new_params)(r); r = solve_unassigned_mvars(s, r); diff --git a/src/kernel/metavar.h b/src/kernel/metavar.h index 09321692c..92e7fab66 100644 --- a/src/kernel/metavar.h +++ b/src/kernel/metavar.h @@ -110,6 +110,7 @@ public: */ expr instantiate_metavars_wo_jst(expr const & e) const; expr instantiate(expr const & e) const { return instantiate_metavars_wo_jst(e); } + expr d_instantiate(expr const & e) { return d_instantiate_metavars_wo_jst(e); } std::pair updt_instantiate_metavars_wo_jst(expr const & e) const;