mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

fix #5829

Browse source
This commit is contained in:
Nikolaj Bjorner 2022-02-09 12:08:36 +02:00
parent 4f6fcf8ea7
commit 07d02ea415
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/api/python/z3/z3.py
View file

@ -8883,7 +8883,7 @@ def _pb_args_coeffs(args, default_ctx=None):
for i in range(len(coeffs)): for i in range(len(coeffs)):
_z3_check_cint_overflow(coeffs[i], "coefficient") _z3_check_cint_overflow(coeffs[i], "coefficient")
_coeffs[i] = coeffs[i] _coeffs[i] = coeffs[i]
return ctx, sz, _args, _coeffs return ctx, sz, _args, _coeffs, args
def PbLe(args, k): def PbLe(args, k):
@ -8893,7 +8893,7 @@ def PbLe(args, k):
>>> f = PbLe(((a,1),(b,3),(c,2)), 3) >>> f = PbLe(((a,1),(b,3),(c,2)), 3)
""" """
_z3_check_cint_overflow(k, "k") _z3_check_cint_overflow(k, "k")
ctx, sz, _args, _coeffs = _pb_args_coeffs(args) ctx, sz, _args, _coeffs, args = _pb_args_coeffs(args)
return BoolRef(Z3_mk_pble(ctx.ref(), sz, _args, _coeffs, k), ctx) return BoolRef(Z3_mk_pble(ctx.ref(), sz, _args, _coeffs, k), ctx)
@ -8904,7 +8904,7 @@ def PbGe(args, k):
>>> f = PbGe(((a,1),(b,3),(c,2)), 3) >>> f = PbGe(((a,1),(b,3),(c,2)), 3)
""" """
_z3_check_cint_overflow(k, "k") _z3_check_cint_overflow(k, "k")
ctx, sz, _args, _coeffs = _pb_args_coeffs(args) ctx, sz, _args, _coeffs, args = _pb_args_coeffs(args)
return BoolRef(Z3_mk_pbge(ctx.ref(), sz, _args, _coeffs, k), ctx) return BoolRef(Z3_mk_pbge(ctx.ref(), sz, _args, _coeffs, k), ctx)
@ -8915,7 +8915,7 @@ def PbEq(args, k, ctx=None):
>>> f = PbEq(((a,1),(b,3),(c,2)), 3) >>> f = PbEq(((a,1),(b,3),(c,2)), 3)
""" """
_z3_check_cint_overflow(k, "k") _z3_check_cint_overflow(k, "k")
ctx, sz, _args, _coeffs = _pb_args_coeffs(args) ctx, sz, _args, _coeffs, args = _pb_args_coeffs(args)
return BoolRef(Z3_mk_pbeq(ctx.ref(), sz, _args, _coeffs, k), ctx) return BoolRef(Z3_mk_pbeq(ctx.ref(), sz, _args, _coeffs, k), ctx)

9
src/ast/pb_decl_plugin.cpp
View file

@ -33,11 +33,9 @@ func_decl * pb_decl_plugin::mk_func_decl(decl_kind k, unsigned num_parameters, p
unsigned arity, sort * const * domain, sort * range) { unsigned arity, sort * const * domain, sort * range) {
SASSERT(m_manager); SASSERT(m_manager);
ast_manager& m = *m_manager; ast_manager& m = *m_manager;
for (unsigned i = 0; i < arity; ++i) { for (unsigned i = 0; i < arity; ++i)
if (!m.is_bool(domain[i])) { if (!m.is_bool(domain[i]))
m.raise_exception("invalid non-Boolean sort applied to 'at-most'"); m.raise_exception("invalid non-Boolean sort applied to 'at-most'");
}
}
symbol sym; symbol sym;
switch(k) { switch(k) {
case OP_AT_LEAST_K: sym = m_at_least_sym; break; case OP_AT_LEAST_K: sym = m_at_least_sym; break;
@ -50,9 +48,8 @@ func_decl * pb_decl_plugin::mk_func_decl(decl_kind k, unsigned num_parameters, p
switch(k) { switch(k) {
case OP_AT_LEAST_K: case OP_AT_LEAST_K:
case OP_AT_MOST_K: { case OP_AT_MOST_K: {
if (num_parameters != 1 || !parameters[0].is_int() || parameters[0].get_int() < 0) { if (num_parameters != 1 || !parameters[0].is_int() || parameters[0].get_int() < 0)
m.raise_exception("function expects one non-negative integer parameter"); m.raise_exception("function expects one non-negative integer parameter");
}
func_decl_info info(m_family_id, k, 1, parameters); func_decl_info info(m_family_id, k, 1, parameters);
return m.mk_func_decl(sym, arity, domain, m.mk_bool_sort(), info); return m.mk_func_decl(sym, arity, domain, m.mk_bool_sort(), info);
} }