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

feat(library/app_builder): add constructor for app_builder that may take subclasses of tmp_type_context

Browse source 
We need this feature because blast has its own version of tmp_type_context.
This commit is contained in:
Leonardo de Moura 2015-11-01 12:07:21 -08:00
parent ee0974650a
commit 137ec27059
2 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/library/app_builder.cpp
View file

@ -14,7 +14,7 @@ Author: Leonardo de Moura
namespace lean { namespace lean {
struct app_builder::imp { struct app_builder::imp {
tmp_type_context m_ctx; std::unique_ptr<tmp_type_context> m_ctx;
struct entry { struct entry {
unsigned m_num_umeta; unsigned m_num_umeta;
@ -97,26 +97,30 @@ struct app_builder::imp {
map m_map; map m_map;
imp(environment const & env, io_state const & ios, reducible_behavior b): imp(environment const & env, io_state const & ios, reducible_behavior b):
m_ctx(env, ios, b) { m_ctx(new tmp_type_context(env, ios, b)) {
}
imp(std::unique_ptr<tmp_type_context> && ctx):
m_ctx(std::move(ctx)) {
} }
levels mk_metavars(declaration const & d, buffer<expr> & mvars, buffer<optional<expr>> & inst_args) { levels mk_metavars(declaration const & d, buffer<expr> & mvars, buffer<optional<expr>> & inst_args) {
m_ctx.clear(); m_ctx->clear();
unsigned num_univ = d.get_num_univ_params(); unsigned num_univ = d.get_num_univ_params();
buffer<level> lvls_buffer; buffer<level> lvls_buffer;
for (unsigned i = 0; i < num_univ; i++) { for (unsigned i = 0; i < num_univ; i++) {
lvls_buffer.push_back(m_ctx.mk_uvar()); lvls_buffer.push_back(m_ctx->mk_uvar());
} }
levels lvls = to_list(lvls_buffer); levels lvls = to_list(lvls_buffer);
expr type = m_ctx.whnf(instantiate_type_univ_params(d, lvls)); expr type = m_ctx->whnf(instantiate_type_univ_params(d, lvls));
while (is_pi(type)) { while (is_pi(type)) {
expr mvar = m_ctx.mk_mvar(binding_domain(type)); expr mvar = m_ctx->mk_mvar(binding_domain(type));
if (binding_info(type).is_inst_implicit()) if (binding_info(type).is_inst_implicit())
inst_args.push_back(some_expr(mvar)); inst_args.push_back(some_expr(mvar));
else else
inst_args.push_back(none_expr()); inst_args.push_back(none_expr());
mvars.push_back(mvar); mvars.push_back(mvar);
type = m_ctx.whnf(instantiate(binding_body(type), mvar)); type = m_ctx->whnf(instantiate(binding_body(type), mvar));
} }
return lvls; return lvls;
} }
@ -126,7 +130,7 @@ struct app_builder::imp {
lean_assert(k.check_invariant()); lean_assert(k.check_invariant());
auto it = m_map.find(k); auto it = m_map.find(k);
if (it == m_map.end()) { if (it == m_map.end()) {
if (auto d = m_ctx.env().find(c)) { if (auto d = m_ctx->env().find(c)) {
buffer<expr> mvars; buffer<expr> mvars;
buffer<optional<expr>> inst_args; buffer<optional<expr>> inst_args;
levels lvls = mk_metavars(*d, mvars, inst_args); levels lvls = mk_metavars(*d, mvars, inst_args);
@ -158,19 +162,19 @@ struct app_builder::imp {
lean_assert(i > 0); lean_assert(i > 0);
--i; --i;
if (inst_arg) { if (inst_arg) {
expr type = m_ctx.instantiate_uvars_mvars(mlocal_type(*inst_arg)); expr type = m_ctx->instantiate_uvars_mvars(mlocal_type(*inst_arg));
if (auto v = m_ctx.mk_class_instance(type)) { if (auto v = m_ctx->mk_class_instance(type)) {
if (!m_ctx.force_assign(*inst_arg, *v)) if (!m_ctx->force_assign(*inst_arg, *v))
return false; return false;
} else { } else {
return false; return false;
} }
} }
if (!m_ctx.is_mvar_assigned(i)) if (!m_ctx->is_mvar_assigned(i))
return false; return false;
} }
for (unsigned i = 0; i < e.m_num_umeta; i++) { for (unsigned i = 0; i < e.m_num_umeta; i++) {
if (!m_ctx.is_uvar_assigned(i)) if (!m_ctx->is_uvar_assigned(i))
return false; return false;
} }
return true; return true;
@ -180,20 +184,20 @@ struct app_builder::imp {
optional<entry> e = get_entry(c, nargs); optional<entry> e = get_entry(c, nargs);
if (!e) if (!e)
return none_expr(); return none_expr();
m_ctx.clear(); m_ctx->clear();
m_ctx.set_next_uvar_idx(e->m_num_umeta); m_ctx->set_next_uvar_idx(e->m_num_umeta);
m_ctx.set_next_mvar_idx(e->m_num_emeta); m_ctx->set_next_mvar_idx(e->m_num_emeta);
unsigned i = nargs; unsigned i = nargs;
for (auto m : e->m_expl_args) { for (auto m : e->m_expl_args) {
if (i == 0) if (i == 0)
return none_expr(); return none_expr();
--i; --i;
if (!m_ctx.assign(m, args[i])) if (!m_ctx->assign(m, args[i]))
return none_expr(); return none_expr();
} }
if (!check_all_assigned(*e)) if (!check_all_assigned(*e))
return none_expr(); return none_expr();
return some_expr(m_ctx.instantiate_uvars_mvars(e->m_app)); return some_expr(m_ctx->instantiate_uvars_mvars(e->m_app));
} }
optional<expr> mk_app(name const & /* c */, unsigned /* mask_sz */, bool const * /* mask */, expr const * /* args */) { optional<expr> mk_app(name const & /* c */, unsigned /* mask_sz */, bool const * /* mask */, expr const * /* args */) {
@ -209,6 +213,10 @@ app_builder::app_builder(environment const & env, reducible_behavior b):
app_builder(env, get_dummy_ios(), b) { app_builder(env, get_dummy_ios(), b) {
} }
app_builder::app_builder(std::unique_ptr<tmp_type_context> && ctx):
m_ptr(new imp(std::move(ctx))) {
}
app_builder::~app_builder() {} app_builder::~app_builder() {}
optional<expr> app_builder::mk_app(name const & c, unsigned nargs, expr const * args) { optional<expr> app_builder::mk_app(name const & c, unsigned nargs, expr const * args) {

2
src/library/app_builder.h
View file

@ -9,6 +9,7 @@ Author: Leonardo de Moura
#include "kernel/environment.h" #include "kernel/environment.h"
#include "library/io_state.h" #include "library/io_state.h"
#include "library/reducible.h" #include "library/reducible.h"
#include "library/tmp_type_context.h"
namespace lean { namespace lean {
/** \brief Helper for creating simple applications where some arguments are inferred using /** \brief Helper for creating simple applications where some arguments are inferred using
@ -31,6 +32,7 @@ class app_builder {
public: public:
app_builder(environment const & env, io_state const & ios, reducible_behavior b = UnfoldReducible); app_builder(environment const & env, io_state const & ios, reducible_behavior b = UnfoldReducible);
app_builder(environment const & env, reducible_behavior b = UnfoldReducible); app_builder(environment const & env, reducible_behavior b = UnfoldReducible);
app_builder(std::unique_ptr<tmp_type_context> && ctx);
~app_builder(); ~app_builder();
/** \brief Create an application (d.{_ ... _} _ ... _ args[0] ... args[nargs-1]). /** \brief Create an application (d.{_ ... _} _ ... _ args[0] ... args[nargs-1]).
The missing arguments and universes levels are inferred using type inference. The missing arguments and universes levels are inferred using type inference.