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

fix(library/type_context): avoid errors in the infer type method due to opaque constants

Browse source
This commit is contained in:
Leonardo de Moura 2015-11-12 20:04:16 -08:00
parent 9aaa2d0991
commit d9816b6e21
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/library/type_context.cpp
View file

@ -118,6 +118,7 @@ type_context::type_context(environment const & env, io_state const & ios, tmp_lo
m_ci_multiple_instances = multiple_instances; m_ci_multiple_instances = multiple_instances;
m_ignore_external_mvars = false; m_ignore_external_mvars = false;
m_check_types = true; m_check_types = true;
m_relax_is_opaque = false;
// TODO(Leo): use compilation options for setting config // TODO(Leo): use compilation options for setting config
m_ci_max_depth = 32; m_ci_max_depth = 32;
m_ci_trans_instances = true; m_ci_trans_instances = true;
@ -144,7 +145,11 @@ bool type_context::is_opaque(declaration const & d) const {
if (d.is_theorem()) if (d.is_theorem())
return true; return true;
name const & n = d.get_name(); name const & n = d.get_name();
return m_proj_info.contains(n) || is_extra_opaque(n); if (m_proj_info.contains(n))
return true;
if (m_relax_is_opaque)
return false;
return is_extra_opaque(n);
} }
optional<expr> type_context::expand_macro(expr const & m) { optional<expr> type_context::expand_macro(expr const & m) {
@ -301,6 +306,11 @@ expr type_context::whnf(expr const & e) {
} }
} }
expr type_context::relaxed_whnf(expr const & e) {
flet<bool> relax(m_relax_is_opaque, true);
return whnf(e);
}
static bool is_max_like(level const & l) { static bool is_max_like(level const & l) {
return is_max(l) || is_imax(l); return is_max(l) || is_imax(l);
} }
@ -1054,7 +1064,7 @@ expr type_context::infer_pi(expr const & e0) {
expr e = e0; expr e = e0;
while (is_pi(e)) { while (is_pi(e)) {
expr d = instantiate_rev(binding_domain(e), ls.size(), ls.data()); expr d = instantiate_rev(binding_domain(e), ls.size(), ls.data());
expr d_type = whnf(infer(d)); expr d_type = relaxed_whnf(infer(d));
ensure_sort(d_type, e0); ensure_sort(d_type, e0);
us.push_back(sort_level(d_type)); us.push_back(sort_level(d_type));
expr l = mk_tmp_local(d, binding_info(e)); expr l = mk_tmp_local(d, binding_info(e));
@ -1062,7 +1072,7 @@ expr type_context::infer_pi(expr const & e0) {
e = binding_body(e); e = binding_body(e);
} }
e = instantiate_rev(e, ls.size(), ls.data()); e = instantiate_rev(e, ls.size(), ls.data());
expr e_type = whnf(infer(e)); expr e_type = relaxed_whnf(infer(e));
ensure_sort(e_type, e0); ensure_sort(e_type, e0);
level r = sort_level(e_type); level r = sort_level(e_type);
unsigned i = ls.size(); unsigned i = ls.size();
@ -1093,7 +1103,7 @@ expr type_context::infer_app(expr const & e) {
if (is_pi(f_type)) { if (is_pi(f_type)) {
f_type = binding_body(f_type); f_type = binding_body(f_type);
} else { } else {
f_type = whnf(instantiate_rev(f_type, i-j, args.data()+j)); f_type = relaxed_whnf(instantiate_rev(f_type, i-j, args.data()+j));
ensure_pi(f_type, e); ensure_pi(f_type, e);
f_type = binding_body(f_type); f_type = binding_body(f_type);
j = i; j = i;

7
src/library/type_context.h
View file

@ -166,6 +166,10 @@ class type_context {
*/ */
bool m_check_types; bool m_check_types;
/** Temporary flag to override/ignore the is_extra_opaque predicate.
We use it when inferring types and we want to be sure a type is Pi-type. */
bool m_relax_is_opaque;
bool is_opaque(declaration const & d) const; bool is_opaque(declaration const & d) const;
optional<expr> reduce_projection(expr const & e); optional<expr> reduce_projection(expr const & e);
optional<expr> norm_ext(expr const & e); optional<expr> norm_ext(expr const & e);
@ -422,6 +426,9 @@ public:
/** \brief Put the given term in weak-head-normal-form (modulo is_opaque predicate) */ /** \brief Put the given term in weak-head-normal-form (modulo is_opaque predicate) */
expr whnf(expr const & e); expr whnf(expr const & e);
/** \brief Similar to previous method but ignores the is_extra_opaque predicate. */
expr relaxed_whnf(expr const & e);
/** \brief Return true if \c e is a proposition */ /** \brief Return true if \c e is a proposition */
bool is_prop(expr const & e); bool is_prop(expr const & e);