michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf(library/unifier): use d_instantiate_metavars

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2014-07-12 05:12:09 +01:00
parent 9517f31a71
commit 391e5e2bc2
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/kernel/metavar.h
View file

@ -23,10 +23,8 @@ class substitution {
jst_map m_expr_jsts; jst_map m_expr_jsts;
jst_map m_level_jsts; jst_map m_level_jsts;
std::pair<expr, justification> d_instantiate_metavars(expr const & e);
expr d_instantiate_metavars_wo_jst(expr const & e);
std::pair<level, justification> d_instantiate_metavars(level const & l, bool use_jst, bool updt);
friend class instantiate_metavars_fn; friend class instantiate_metavars_fn;
std::pair<level, justification> d_instantiate_metavars(level const & l, bool use_jst, bool updt);
justification get_expr_jst(name const & m) const { if (auto it = m_expr_jsts.find(m)) return *it; else return justification(); } justification get_expr_jst(name const & m) const { if (auto it = m_expr_jsts.find(m)) return *it; else return justification(); }
justification get_level_jst(name const & m) const { if (auto it = m_level_jsts.find(m)) return *it; else return justification(); } justification get_level_jst(name const & m) const { if (auto it = m_level_jsts.find(m)) return *it; else return justification(); }
@ -60,6 +58,10 @@ public:
void d_assign(level const & m, level const & t, justification const & j) { d_assign(meta_id(m), t, j); } void d_assign(level const & m, level const & t, justification const & j) { d_assign(meta_id(m), t, j); }
void d_assign(level const & m, level const & t) { d_assign(m, t, justification ()); } void d_assign(level const & m, level const & t) { d_assign(m, t, justification ()); }
std::pair<expr, justification> d_instantiate_metavars(expr const & e);
expr d_instantiate_metavars_wo_jst(expr const & e);
std::pair<level, justification> d_instantiate_metavars(level const & l) { return d_instantiate_metavars(l, true, true); }
void d_forget_justifications() { m_expr_jsts = jst_map(); m_level_jsts = jst_map(); } void d_forget_justifications() { m_expr_jsts = jst_map(); m_level_jsts = jst_map(); }
substitution forget_justifications() const { substitution s(*this); s.d_forget_justifications(); return s; } substitution forget_justifications() const { substitution s(*this); s.d_forget_justifications(); return s; }
@ -76,13 +78,15 @@ public:
bool is_assigned(expr const & m) const { lean_assert(is_metavar(m)); return is_expr_assigned(mlocal_name(m)); } bool is_assigned(expr const & m) const { lean_assert(is_metavar(m)); return is_expr_assigned(mlocal_name(m)); }
opt_expr_jst get_assignment(expr const & m) const { lean_assert(is_metavar(m)); return get_expr_assignment(mlocal_name(m)); } opt_expr_jst get_assignment(expr const & m) const { lean_assert(is_metavar(m)); return get_expr_assignment(mlocal_name(m)); }
optional<expr> get_expr(expr const & m) const { lean_assert(is_metavar(m)); return get_expr(mlocal_name(m)); } optional<expr> get_expr(expr const & m) const { lean_assert(is_metavar(m)); return get_expr(mlocal_name(m)); }
substitution assign(expr const & m, expr const & t, justification const & j) { lean_assert(is_metavar(m)); return assign(mlocal_name(m), t, j); } substitution assign(expr const & m, expr const & t, justification const & j) {
lean_assert(is_metavar(m)); return assign(mlocal_name(m), t, j); }
substitution assign(expr const & m, expr const & t) const { lean_assert(is_metavar(m)); return assign(mlocal_name(m), t); } substitution assign(expr const & m, expr const & t) const { lean_assert(is_metavar(m)); return assign(mlocal_name(m), t); }
bool is_assigned(level const & m) const { lean_assert(is_meta(m)); return is_level_assigned(meta_id(m)); } bool is_assigned(level const & m) const { lean_assert(is_meta(m)); return is_level_assigned(meta_id(m)); }
opt_level_jst get_assignment(level const & m) const { lean_assert(is_meta(m)); return get_level_assignment(meta_id(m)); } opt_level_jst get_assignment(level const & m) const { lean_assert(is_meta(m)); return get_level_assignment(meta_id(m)); }
optional<level> get_level(level const & m) const { lean_assert(is_meta(m)); return get_level(meta_id(m)); } optional<level> get_level(level const & m) const { lean_assert(is_meta(m)); return get_level(meta_id(m)); }
substitution assign(level const & m, level const & l, justification const & j) const { lean_assert(is_meta(m)); return assign(meta_id(m), l, j); } substitution assign(level const & m, level const & l, justification const & j) const {
lean_assert(is_meta(m)); return assign(meta_id(m), l, j); }
substitution assign(level const & m, level const & l) { lean_assert(is_meta(m)); return assign(meta_id(m), l); } substitution assign(level const & m, level const & l) { lean_assert(is_meta(m)); return assign(meta_id(m), l); }
/** /**

10
src/library/unifier.cpp
View file

@ -477,8 +477,8 @@ struct unifier_fn {
std::pair<constraint, bool> instantiate_metavars(constraint const & c) { std::pair<constraint, bool> instantiate_metavars(constraint const & c) {
if (is_eq_cnstr(c)) { if (is_eq_cnstr(c)) {
auto lhs_jst = m_subst.instantiate_metavars(cnstr_lhs_expr(c)); auto lhs_jst = m_subst.d_instantiate_metavars(cnstr_lhs_expr(c));
auto rhs_jst = m_subst.instantiate_metavars(cnstr_rhs_expr(c)); auto rhs_jst = m_subst.d_instantiate_metavars(cnstr_rhs_expr(c));
expr lhs = lhs_jst.first; expr lhs = lhs_jst.first;
expr rhs = rhs_jst.first; expr rhs = rhs_jst.first;
if (lhs != cnstr_lhs_expr(c) || rhs != cnstr_rhs_expr(c)) { if (lhs != cnstr_lhs_expr(c) || rhs != cnstr_rhs_expr(c)) {
@ -486,8 +486,8 @@ struct unifier_fn {
true); true);
} }
} else if (is_level_eq_cnstr(c)) { } else if (is_level_eq_cnstr(c)) {
auto lhs_jst = m_subst.instantiate_metavars(cnstr_lhs_level(c)); auto lhs_jst = m_subst.d_instantiate_metavars(cnstr_lhs_level(c));
auto rhs_jst = m_subst.instantiate_metavars(cnstr_rhs_level(c)); auto rhs_jst = m_subst.d_instantiate_metavars(cnstr_rhs_level(c));
level lhs = lhs_jst.first; level lhs = lhs_jst.first;
level rhs = rhs_jst.first; level rhs = rhs_jst.first;
if (lhs != cnstr_lhs_level(c) || rhs != cnstr_rhs_level(c)) { if (lhs != cnstr_lhs_level(c) || rhs != cnstr_rhs_level(c)) {
@ -760,7 +760,7 @@ struct unifier_fn {
lean_assert(is_choice_cnstr(c)); lean_assert(is_choice_cnstr(c));
expr const & m = cnstr_expr(c); expr const & m = cnstr_expr(c);
choice_fn const & fn = cnstr_choice_fn(c); choice_fn const & fn = cnstr_choice_fn(c);
auto m_type_jst = m_subst.instantiate_metavars(m_tc->infer(m)); auto m_type_jst = m_subst.d_instantiate_metavars(m_tc->infer(m));
lazy_list<constraints> alts = fn(m, m_type_jst.first, m_subst, m_ngen.mk_child()); lazy_list<constraints> alts = fn(m, m_type_jst.first, m_subst, m_ngen.mk_child());
return process_lazy_constraints(alts, mk_composite1(c.get_justification(), m_type_jst.second)); return process_lazy_constraints(alts, mk_composite1(c.get_justification(), m_type_jst.second));
} }