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

fix(kernel/instantiate): compilation problem on Windows

Browse source
This commit is contained in:
Leonardo de Moura 2019-09-18 17:15:22 -07:00
parent 8148136aa9
commit 2abca22e00
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/kernel/instantiate.cpp
View file

@ -59,11 +59,11 @@ extern "C" object * lean_expr_instantiate(object * a0, object * subst) {
nat const & vidx = bvar_idx(m);
if (vidx >= offset) {
size_t h = offset + n;
if (h < offset /* overflow, h is bigger than any vidx */ || vidx < h) {
if (h < offset /* overflow, h is bigger than any vidx */ || (vidx.is_small() && vidx.get_small_value() < h)) {
expr v(lean_array_get_core(subst, vidx.get_small_value() - offset), true);
return some_expr(lift_loose_bvars(v, offset));
} else {
return some_expr(mk_bvar(vidx - nat(n)));
return some_expr(mk_bvar(vidx - nat::of_size_t(n)));
}
}
}
@ -82,7 +82,7 @@ expr instantiate_rev(expr const & a, unsigned n, expr const * subst) {
nat const & vidx = bvar_idx(m);
if (vidx >= offset) {
size_t h = offset + n;
if (h < offset /* overflow, h is bigger than any vidx */ || vidx < h) {
if (h < offset /* overflow, h is bigger than any vidx */ || (vidx.is_small() && vidx.get_small_value() < h)) {
return some_expr(lift_loose_bvars(subst[n - (vidx.get_small_value() - offset) - 1], offset));
} else {
return some_expr(mk_bvar(vidx - nat(n)));
@ -107,11 +107,11 @@ extern "C" object * lean_expr_instantiate_rev(object * a0, object * subst) {
nat const & vidx = bvar_idx(m);
if (vidx >= offset) {
size_t h = offset + n;
if (h < offset /* overflow, h is bigger than any vidx */ || vidx < h) {
if (h < offset /* overflow, h is bigger than any vidx */ || (vidx.is_small() && vidx.get_small_value() < h)) {
expr v(lean_array_get_core(subst, n - (vidx.get_small_value() - offset) - 1), true);
return some_expr(lift_loose_bvars(v, offset));
} else {
return some_expr(mk_bvar(vidx - nat(n)));
return some_expr(mk_bvar(vidx - nat::of_size_t(n)));
}
}
}

2
src/util/nat.h
View file

@ -25,6 +25,8 @@ public:
if (m > 0)
*this = nat(mk_nat_obj(m));
}
static nat of_size_t(size_t v) { return nat(lean_usize_to_nat(v)); }
nat(nat const & other):object_ref(other) {}
nat(nat && other):object_ref(other) {}