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

fix(library/blast/blast): metavariable assignment validation

Browse source
This commit is contained in:
Leonardo de Moura 2015-11-19 10:38:35 -08:00
parent b4b365239f
commit 193c446fc4
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/library/blast/blast.cpp
View file

@ -7,6 +7,7 @@ Author: Leonardo de Moura
#include <vector>
#include "util/sstream.h"
#include "kernel/for_each_fn.h"
#include "kernel/find_fn.h"
#include "kernel/type_checker.h"
#include "library/replace_visitor.h"
#include "library/util.h"
@ -106,6 +107,29 @@ class blastenv {
m_benv.m_curr_state.assign_mref(m, v);
}
bool check_href_core(metavar_decl const & d, expr const & h, hypothesis_idx_set & visited) {
lean_assert(is_href(h));
lean_assert(!d.contains_href(h));
if (visited.contains(href_index(h)))
return true;
visited.insert(href_index(h));
state & s = m_benv.m_curr_state;
hypothesis const & h_decl = s.get_hypothesis_decl(h);
if (h_decl.is_assumption())
return false;
return !find(*h_decl.get_value(), [&](expr const & e, unsigned) {
return is_href(e) && !d.contains_href(e) && !check_href_core(d, e, visited);
});
}
bool check_href(metavar_decl const & d, expr const & h) {
lean_assert(is_href(h));
if (d.contains_href(h))
return true;
hypothesis_idx_set visited;
return check_href_core(d, h, visited);
}
virtual bool validate_assignment(expr const & m, buffer<expr> const & locals, expr const & v) {
// We must check
// 1. All href in new_v are in the context of m.
@ -121,7 +145,7 @@ class blastenv {
if (!ok)
return false; // stop search
if (is_href(e)) {
if (!d->contains_href(e)) {
if (!check_href(*d, e)) {
ok = false; // failed 1
return false;
}