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

fix(library/class_instance_resolution): position information in the type class trace

Browse source
This commit is contained in:
Leonardo de Moura 2015-10-18 12:52:52 -07:00
parent 088b0fb795
commit 919d55b799
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/library/class_instance_resolution.cpp
View file

@ -1100,11 +1100,13 @@ struct cienv {
} }
} }
optional<expr> operator()(environment const & env, options const & o, pos_info_provider const * pip, list<expr> const & ctx, expr const & type) { optional<expr> operator()(environment const & env, options const & o, pos_info_provider const * pip, list<expr> const & ctx, expr const & type,
expr const & pos_ref) {
reset_cache_and_ctx();
set_env(env); set_env(env);
set_options(o); set_options(o);
set_ctx(ctx); set_ctx(ctx);
set_pos_info(pip, type); set_pos_info(pip, pos_ref);
if (auto r = check_cache(type)) { if (auto r = check_cache(type)) {
if (m_trace_instances) { if (m_trace_instances) {
@ -1144,9 +1146,14 @@ ci_type_inference_factory_scope::~ci_type_inference_factory_scope() {
g_factory = m_old; g_factory = m_old;
} }
optional<expr> mk_class_instance(environment const & env, io_state const & ios, list<expr> const & ctx, expr const & e, pos_info_provider const * pip) { static optional<expr> mk_class_instance(environment const & env, io_state const & ios, list<expr> const & ctx, expr const & e, pos_info_provider const * pip,
expr const & pos_ref) {
flet<io_state*> set_ios(g_ios, const_cast<io_state*>(&ios)); flet<io_state*> set_ios(g_ios, const_cast<io_state*>(&ios));
return get_cienv()(env, ios.get_options(), pip, ctx, e); return get_cienv()(env, ios.get_options(), pip, ctx, e, pos_ref);
}
optional<expr> mk_class_instance(environment const & env, io_state const & ios, list<expr> const & ctx, expr const & e, pos_info_provider const * pip) {
return mk_class_instance(env, ios, ctx, e, pip, e);
} }
optional<expr> mk_class_instance(environment const & env, list<expr> const & ctx, expr const & e, pos_info_provider const * pip) { optional<expr> mk_class_instance(environment const & env, list<expr> const & ctx, expr const & e, pos_info_provider const * pip) {
@ -1162,7 +1169,7 @@ class class_multi_instance_iterator : public choice_iterator {
optional<expr> m_first; optional<expr> m_first;
public: public:
class_multi_instance_iterator(environment const & env, io_state const & ios, list<expr> const & ctx, class_multi_instance_iterator(environment const & env, io_state const & ios, list<expr> const & ctx,
expr const & e, pos_info_provider const * pip, expr const & e, pos_info_provider const * pip, expr const & pos_ref,
expr const & new_meta, justification const & new_j, expr const & new_meta, justification const & new_j,
bool is_strict): bool is_strict):
choice_iterator(!is_strict), choice_iterator(!is_strict),
@ -1171,7 +1178,7 @@ public:
m_new_meta(new_meta), m_new_meta(new_meta),
m_new_j(new_j) { m_new_j(new_j) {
flet<io_state*> set_ios(g_ios, const_cast<io_state*>(&m_ios)); flet<io_state*> set_ios(g_ios, const_cast<io_state*>(&m_ios));
m_first = m_cienv(env, ios.get_options(), pip, ctx, e); m_first = m_cienv(env, ios.get_options(), pip, ctx, e, pos_ref);
} }
virtual ~class_multi_instance_iterator() {} virtual ~class_multi_instance_iterator() {}
@ -1214,9 +1221,10 @@ static constraint mk_class_instance_root_cnstr(environment const & env, io_state
justification new_j = mj.second; justification new_j = mj.second;
if (multiple_insts) { if (multiple_insts) {
return choose(std::shared_ptr<choice_iterator>(new class_multi_instance_iterator(env, ios, ctx.get_data(), return choose(std::shared_ptr<choice_iterator>(new class_multi_instance_iterator(env, ios, ctx.get_data(),
meta_type, pip, new_meta, new_j, is_strict))); meta_type, pip, meta,
new_meta, new_j, is_strict)));
} else { } else {
if (auto r = mk_class_instance(env, ios, ctx.get_data(), meta_type, pip)) { if (auto r = mk_class_instance(env, ios, ctx.get_data(), meta_type, pip, meta)) {
constraint c = mk_eq_cnstr(new_meta, *r, new_j); constraint c = mk_eq_cnstr(new_meta, *r, new_j);
return lazy_list<constraints>(constraints(c)); return lazy_list<constraints>(constraints(c));
} else if (is_strict) { } else if (is_strict) {