max/lean4-htt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fix(library/type_context): bug in occurs check

Browse source
This commit is contained in:
Leonardo de Moura 2016-09-19 11:40:00 -07:00
parent 0a6f571f07
commit e4553e0446
2 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/library/type_context.cpp
View file

@ -1211,28 +1211,26 @@ bool type_context::is_def_eq_core(level const & l1, level const & l2) {
flet<unsigned> inc_depth(m_is_def_eq_depth, m_is_def_eq_depth+1);
if (in_tmp_mode()) {
/* Check if tmp metavars are already assigned when in tmp mode */
if (is_idx_metauniv(l1)) {
if (auto v1 = get_tmp_assignment(l1))
/* TODO(Leo): we should instantiate any assigned regular metavariable
when we are in tmp_mode. */
if (is_metavar_decl_ref(l1)) {
/* Check if l1 is regular metavar that is already assigned */
if (auto v1 = m_mctx.get_assignment(l1))
return is_def_eq_core(*v1, l2);
}
if (is_idx_metauniv(l2)) {
if (auto v2 = get_tmp_assignment(l2))
if (is_metavar_decl_ref(l2)) {
/* Check if l2 is regular metavar that is already assigned */
if (auto v2 = m_mctx.get_assignment(l2))
return is_def_eq_core(l1, *v2);
}
}
if (is_metavar_decl_ref(l1)) {
/* Check if l1 is regular metavar that is already assigned */
if (auto v1 = m_mctx.get_assignment(l1))
return is_def_eq_core(*v1, l2);
}
level new_l1 = instantiate_mvars(l1);
level new_l2 = instantiate_mvars(l2);
if (is_metavar_decl_ref(l2)) {
/* Check if l2 is regular metavar that is already assigned */
if (auto v2 = m_mctx.get_assignment(l2))
return is_def_eq_core(l1, *v2);
}
if (l1 != new_l1 || l2 != new_l2)
return is_def_eq_core(new_l1, new_l2);
if (is_mvar(l1)) {
lean_assert(!is_assigned(l1));
@ -1250,12 +1248,6 @@ bool type_context::is_def_eq_core(level const & l1, level const & l2) {
}
}
level new_l1 = instantiate_mvars(l1);
level new_l2 = instantiate_mvars(l2);
if (l1 != new_l1 || l2 != new_l2)
return is_def_eq_core(new_l1, new_l2);
if (l1.kind() != l2.kind())
return false;

1
tests/lean/run/simplifier_canonize_subsingletons.lean
View file

@ -1,3 +1,4 @@
set_option new_elaborator true
open tactic
namespace synth_congr