mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 06:03:23 +00:00
Code Activity

Fix floats in Z3_get_numeral_*string.

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2019-08-19 13:10:43 +01:00
parent 79cd1f0edc
commit f22d6e399d
No known key found for this signature in database
GPG key ID: BCF6360F86294467
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/api/api_numeral.cpp
View file

@ -192,7 +192,6 @@ extern "C" {
return mk_c(c)->mk_external_string(r.to_string()); return mk_c(c)->mk_external_string(r.to_string());
} }
else { else {
// floats are separated from all others to avoid huge rationals.
fpa_util & fu = mk_c(c)->fpautil(); fpa_util & fu = mk_c(c)->fpautil();
scoped_mpf tmp(fu.fm()); scoped_mpf tmp(fu.fm());
mpf_rounding_mode rm; mpf_rounding_mode rm;
@ -217,7 +216,9 @@ extern "C" {
} }
} }
else if (mk_c(c)->fpautil().is_numeral(to_expr(a), tmp)) { else if (mk_c(c)->fpautil().is_numeral(to_expr(a), tmp)) {
return mk_c(c)->mk_external_string(fu.fm().to_string(tmp)); std::ostringstream buffer;
fu.fm().display_smt2(buffer, tmp, false);
return mk_c(c)->mk_external_string(buffer.str());
} }
else { else {
SET_ERROR_CODE(Z3_INVALID_ARG, nullptr); SET_ERROR_CODE(Z3_INVALID_ARG, nullptr);
@ -254,6 +255,9 @@ extern "C" {
expr* e = to_expr(a); expr* e = to_expr(a);
rational r; rational r;
arith_util & u = mk_c(c)->autil(); arith_util & u = mk_c(c)->autil();
fpa_util & fu = mk_c(c)->fpautil();
scoped_mpf ftmp(fu.fm());
mpf_rounding_mode rm;
if (u.is_numeral(e, r) && !r.is_int()) { if (u.is_numeral(e, r) && !r.is_int()) {
std::ostringstream buffer; std::ostringstream buffer;
r.display_decimal(buffer, precision); r.display_decimal(buffer, precision);
@ -266,8 +270,14 @@ extern "C" {
am.display_decimal(buffer, n, precision); am.display_decimal(buffer, n, precision);
return mk_c(c)->mk_external_string(buffer.str()); return mk_c(c)->mk_external_string(buffer.str());
} }
bool ok = Z3_get_numeral_rational(c, a, r); else if (mk_c(c)->fpautil().is_rm_numeral(to_expr(a), rm))
if (ok) { return Z3_get_numeral_string(c, a);
else if (mk_c(c)->fpautil().is_numeral(to_expr(a), ftmp)) {
std::ostringstream buffer;
fu.fm().display_decimal(buffer, ftmp, 12);
return mk_c(c)->mk_external_string(buffer.str());
}
else if (Z3_get_numeral_rational(c, a, r)) {
return mk_c(c)->mk_external_string(r.to_string()); return mk_c(c)->mk_external_string(r.to_string());
} }
else { else {