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

feat(library/compiler): use new constructor info

Browse source
This commit is contained in:
Leonardo de Moura 2018-09-14 13:51:53 -07:00
parent 4874e25715
commit 75b494e33d
2 changed files with 12 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/library/compiler/csimp.cpp
View file

@ -124,20 +124,14 @@ class csimp_fn {
expr reduce_cases_cnstr(expr const & c, buffer<expr> const & args, inductive_val const & I_val, expr const & major) {
lean_assert(is_constructor_app(env(), major));
unsigned nparams = I_val.get_nparams();
names cnstrs = I_val.get_cnstrs();
buffer<expr> k_args;
expr const & k = get_app_args(major, k_args);
lean_assert(is_constant(k));
lean_assert(nparams <= k_args.size());
unsigned first_minor_idx = I_val.get_nparams() + 1 /* typeformer/motive */ + I_val.get_nindices() + 1 /* major */;
for (unsigned i = first_minor_idx; i < args.size(); i++) {
lean_assert(!empty(cnstrs));
if (head(cnstrs) == const_name(k)) {
return beta_reduce(args[i], k_args.size() - nparams, k_args.data() + nparams);
}
cnstrs = tail(cnstrs);
}
lean_unreachable();
unsigned first_minor_idx = nparams + 1 /* typeformer/motive */ + I_val.get_nindices() + 1 /* major */;
constructor_val k_val = env().get(const_name(k)).to_constructor_val();
expr const & minor = args[first_minor_idx + k_val.get_cidx()];
return beta_reduce(minor, k_args.size() - nparams, k_args.data() + nparams);
}
expr visit_cases(expr const & e) {

34
src/library/compiler/lcnf.cpp
View file

@ -83,27 +83,8 @@ public:
return visit(apply_beta(fn_val, args.size(), args.data()), root);
}
pair<unsigned, unsigned> get_constructor_arity_nfields(name const & n) {
constant_info cnstr_info = env().get(n);
lean_assert(cnstr_info.is_constructor());
unsigned nparams = cnstr_info.to_constructor_val().get_nparams();
unsigned cnstr_arity = 0;
expr cnstr_type = cnstr_info.get_type();
while (is_pi(cnstr_type)) {
cnstr_arity++;
cnstr_type = binding_body(cnstr_type);
}
lean_assert(cnstr_arity >= nparams);
unsigned num_fields = cnstr_arity - nparams;
return mk_pair(cnstr_arity, num_fields);
}
unsigned get_constructor_arity(name const & n) {
return get_constructor_arity_nfields(n).first;
}
unsigned get_constructor_nfields(name const & n) {
return get_constructor_arity_nfields(n).second;
return env().get(n).to_constructor_val().get_nfields();
}
expr visit_cases_on(expr const & fn, buffer<expr> & args, bool root) {
@ -268,11 +249,12 @@ public:
}
expr visit_constructor(expr const & fn, buffer<expr> & args, bool root) {
unsigned arity = get_constructor_arity(const_name(fn));
constructor_val cval = env().get(const_name(fn)).to_constructor_val();
unsigned arity = cval.get_nparams() + cval.get_nfields();
if (args.size() < arity) {
return visit(eta_expand(mk_app(fn, args), arity - args.size()), root);
} else {
return visit_app_default(fn, args, root);
return visit_app_default(fn, args);
}
}
@ -306,7 +288,7 @@ public:
return true;
}
expr visit_app_default(expr const & fn, buffer<expr> & args, bool root) {
expr visit_app_default(expr const & fn, buffer<expr> & args) {
for (expr & arg : args) {
arg = visit(arg, false);
}
@ -342,10 +324,10 @@ public:
}
}
fn = visit(fn, false);
return visit_app_default(fn, args, root);
return visit_app_default(fn, args);
}
expr visit_proj(expr const & e, bool root) {
expr visit_proj(expr const & e) {
expr v = visit(proj_expr(e), false);
expr r = mk_proj(proj_idx(e), v);
return mk_let_decl(r);
@ -453,7 +435,7 @@ public:
switch (e.kind()) {
case expr_kind::App: return cache_result(e, visit_app(e, root), shared);
case expr_kind::Proj: return cache_result(e, visit_proj(e, root), shared);
case expr_kind::Proj: return cache_result(e, visit_proj(e), shared);
case expr_kind::MData: return cache_result(e, visit_mdata(e, root), shared);
case expr_kind::Lambda: return cache_result(e, visit_lambda(e, root), shared);
case expr_kind::Let: return cache_result(e, visit_let(e, root), shared);