mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-20 04:43:39 +00:00
Code Activity

Fixed Z3_get_numeral_double. Fixes #2501.

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

22
src/api/api_numeral.cpp
View file

@ -69,7 +69,7 @@ extern "C" {
(' ' == *m) || ('\n' == *m) || (' ' == *m) || ('\n' == *m) ||
('.' == *m) || ('e' == *m) || ('.' == *m) || ('e' == *m) ||
('E' == *m) || ('+' == *m) || ('E' == *m) || ('+' == *m) ||
(is_float && (is_float &&
(('p' == *m) || (('p' == *m) ||
('P' == *m))))) { ('P' == *m))))) {
SET_ERROR_CODE(Z3_PARSER_ERROR, nullptr); SET_ERROR_CODE(Z3_PARSER_ERROR, nullptr);
@ -145,7 +145,7 @@ extern "C" {
bool Z3_API Z3_is_numeral_ast(Z3_context c, Z3_ast a) { bool Z3_API Z3_is_numeral_ast(Z3_context c, Z3_ast a) {
Z3_TRY; Z3_TRY;
LOG_Z3_is_numeral_ast(c, a); LOG_Z3_is_numeral_ast(c, a);
RESET_ERROR_CODE(); RESET_ERROR_CODE();
CHECK_IS_EXPR(a, false); CHECK_IS_EXPR(a, false);
expr* e = to_expr(a); expr* e = to_expr(a);
return return
@ -228,8 +228,22 @@ extern "C" {
} }
double Z3_API Z3_get_numeral_double(Z3_context c, Z3_ast a) { double Z3_API Z3_get_numeral_double(Z3_context c, Z3_ast a) {
Z3_string s = Z3_get_numeral_decimal_string(c, a, 12); LOG_Z3_get_numeral_double(c, a);
return std::stod(std::string(s)); RESET_ERROR_CODE();
if (!is_expr(a)) {
SET_ERROR_CODE(Z3_INVALID_ARG, nullptr);
return 0.0/0.0;
}
expr* e = to_expr(a);
fpa_util & fu = mk_c(c)->fpautil();
scoped_mpf tmp(fu.fm());
if (!mk_c(c)->fpautil().is_numeral(e, tmp) ||
tmp.get().get_ebits() > 11 ||
tmp.get().get_sbits() > 53) {
SET_ERROR_CODE(Z3_INVALID_ARG, nullptr);
return 0.0/0.0;
}
return fu.fm().to_double(tmp);
} }
Z3_string Z3_API Z3_get_numeral_decimal_string(Z3_context c, Z3_ast a, unsigned precision) { Z3_string Z3_API Z3_get_numeral_decimal_string(Z3_context c, Z3_ast a, unsigned precision) {