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

Merge branch 'master' of https://github.com/Z3Prover/z3

Browse source
This commit is contained in:
Nikolaj Bjorner 2016-11-12 08:58:09 -08:00
commit fc7a217cd0
2 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/api/api_fpa.cpp
View file

@ -909,6 +909,10 @@ extern "C" {
Z3_TRY; Z3_TRY;
LOG_Z3_fpa_get_numeral_sign(c, t, sgn); LOG_Z3_fpa_get_numeral_sign(c, t, sgn);
RESET_ERROR_CODE(); RESET_ERROR_CODE();
if (sgn == 0) {
SET_ERROR_CODE(Z3_INVALID_ARG);
return 0;
}
ast_manager & m = mk_c(c)->m(); ast_manager & m = mk_c(c)->m();
mpf_manager & mpfm = mk_c(c)->fpautil().fm(); mpf_manager & mpfm = mk_c(c)->fpautil().fm();
fpa_decl_plugin * plugin = (fpa_decl_plugin*)m.get_plugin(mk_c(c)->get_fpa_fid()); fpa_decl_plugin * plugin = (fpa_decl_plugin*)m.get_plugin(mk_c(c)->get_fpa_fid());
@ -968,6 +972,10 @@ extern "C" {
Z3_TRY; Z3_TRY;
LOG_Z3_fpa_get_numeral_significand_uint64(c, t, n); LOG_Z3_fpa_get_numeral_significand_uint64(c, t, n);
RESET_ERROR_CODE(); RESET_ERROR_CODE();
if (n == 0) {
SET_ERROR_CODE(Z3_INVALID_ARG);
return 0;
}
ast_manager & m = mk_c(c)->m(); ast_manager & m = mk_c(c)->m();
mpf_manager & mpfm = mk_c(c)->fpautil().fm(); mpf_manager & mpfm = mk_c(c)->fpautil().fm();
unsynch_mpz_manager & mpzm = mpfm.mpz_manager(); unsynch_mpz_manager & mpzm = mpfm.mpz_manager();
@ -1028,6 +1036,10 @@ extern "C" {
Z3_TRY; Z3_TRY;
LOG_Z3_fpa_get_numeral_exponent_int64(c, t, n); LOG_Z3_fpa_get_numeral_exponent_int64(c, t, n);
RESET_ERROR_CODE(); RESET_ERROR_CODE();
if (n == 0) {
SET_ERROR_CODE(Z3_INVALID_ARG);
return 0;
}
ast_manager & m = mk_c(c)->m(); ast_manager & m = mk_c(c)->m();
mpf_manager & mpfm = mk_c(c)->fpautil().fm(); mpf_manager & mpfm = mk_c(c)->fpautil().fm();
family_id fid = mk_c(c)->get_fpa_fid(); family_id fid = mk_c(c)->get_fpa_fid();

30
src/api/z3_replayer.cpp
View file

@ -14,7 +14,7 @@ Author:
Leonardo de Moura (leonardo) 2011-09-22 Leonardo de Moura (leonardo) 2011-09-22
Notes: Notes:
--*/ --*/
#include"vector.h" #include"vector.h"
#include"map.h" #include"map.h"
@ -30,7 +30,7 @@ void register_z3_replayer_cmds(z3_replayer & in);
void throw_invalid_reference() { void throw_invalid_reference() {
TRACE("z3_replayer", tout << "invalid argument reference\n";); TRACE("z3_replayer", tout << "invalid argument reference\n";);
throw z3_replayer_exception("invalid argument reference1"); throw z3_replayer_exception("invalid argument reference");
} }
struct z3_replayer::imp { struct z3_replayer::imp {
@ -72,17 +72,17 @@ struct z3_replayer::imp {
void check_arg(unsigned pos, value_kind k) const { void check_arg(unsigned pos, value_kind k) const {
if (pos >= m_args.size()) { if (pos >= m_args.size()) {
TRACE("z3_replayer", tout << "too few arguments " << m_args.size() << " expecting " << kind2string(k) << "\n";); TRACE("z3_replayer", tout << "too few arguments " << m_args.size() << " expecting " << kind2string(k) << "\n";);
throw z3_replayer_exception("invalid argument reference2"); throw z3_replayer_exception("invalid argument reference");
} }
if (m_args[pos].m_kind != k) { if (m_args[pos].m_kind != k) {
std::stringstream strm; std::stringstream strm;
strm << "expecting " << kind2string(k) << " at position " strm << "expecting " << kind2string(k) << " at position "
<< pos << " but got " << kind2string(m_args[pos].m_kind); << pos << " but got " << kind2string(m_args[pos].m_kind);
throw z3_replayer_exception(strm.str().c_str()); throw z3_replayer_exception(strm.str().c_str());
} }
} }
struct value { struct value {
value_kind m_kind; value_kind m_kind;
union { union {
__int64 m_int; __int64 m_int;
@ -129,7 +129,7 @@ struct z3_replayer::imp {
break; break;
case DOUBLE: case DOUBLE:
out << v.m_double; out << v.m_double;
break; break;
case STRING: case STRING:
out << v.m_str; out << v.m_str;
break; break;
@ -160,7 +160,7 @@ struct z3_replayer::imp {
char curr() const { return m_curr; } char curr() const { return m_curr; }
void new_line() { m_line++; } void new_line() { m_line++; }
void next() { m_curr = m_stream.get(); } void next() { m_curr = m_stream.get(); }
void read_string_core(char delimiter) { void read_string_core(char delimiter) {
if (curr() != delimiter) if (curr() != delimiter)
throw z3_replayer_exception("invalid string/symbol"); throw z3_replayer_exception("invalid string/symbol");
@ -258,7 +258,7 @@ struct z3_replayer::imp {
} }
bool is_double_char() const { bool is_double_char() const {
return curr() == '-' || curr() == '.' || ('0' <= curr() && curr() <= '9') || curr() == 'e' || curr() == 'E'; return curr() == '-' || curr() == '.' || ('0' <= curr() && curr() <= '9') || curr() == 'e' || curr() == 'E';
} }
#if (!defined(strtof)) #if (!defined(strtof))
@ -376,7 +376,7 @@ struct z3_replayer::imp {
} }
} }
else if (k == OBJECT) { else if (k == OBJECT) {
TRACE("z3_replayer_bug", TRACE("z3_replayer_bug",
tout << "args: "; display_args(tout); tout << "\n"; tout << "args: "; display_args(tout); tout << "\n";
tout << "push_back, sz: " << sz << ", m_obj_arrays.size(): " << m_obj_arrays.size() << "\n"; tout << "push_back, sz: " << sz << ", m_obj_arrays.size(): " << m_obj_arrays.size() << "\n";
for (unsigned i = asz - sz; i < asz; i++) { for (unsigned i = asz - sz; i < asz; i++) {
@ -421,7 +421,7 @@ struct z3_replayer::imp {
break; break;
case 'R': case 'R':
// reset // reset
next(); next();
TRACE("z3_replayer", tout << "[" << m_line << "] " << "R\n";); TRACE("z3_replayer", tout << "[" << m_line << "] " << "R\n";);
reset(); reset();
break; break;
@ -432,7 +432,7 @@ struct z3_replayer::imp {
if (m_ptr == 0) { if (m_ptr == 0) {
m_args.push_back(0); m_args.push_back(0);
} }
else { else {
void * obj = 0; void * obj = 0;
if (!m_heap.find(m_ptr, obj)) if (!m_heap.find(m_ptr, obj))
throw z3_replayer_exception("invalid pointer"); throw z3_replayer_exception("invalid pointer");
@ -493,7 +493,7 @@ struct z3_replayer::imp {
next(); skip_blank(); read_double(); next(); skip_blank(); read_double();
TRACE("z3_replayer", tout << "[" << m_line << "] " << "D " << m_double << "\n";); TRACE("z3_replayer", tout << "[" << m_line << "] " << "D " << m_double << "\n";);
m_args.push_back(value(DOUBLE, m_double)); m_args.push_back(value(DOUBLE, m_double));
break; break;
case 'p': case 'p':
case 's': case 's':
case 'u': case 'u':
@ -696,15 +696,15 @@ struct z3_replayer::imp {
m_unsigned_arrays.reset(); m_unsigned_arrays.reset();
m_int_arrays.reset(); m_int_arrays.reset();
} }
}; };
z3_replayer::z3_replayer(std::istream & in) { z3_replayer::z3_replayer(std::istream & in) {
m_imp = alloc(imp, *this, in); m_imp = alloc(imp, *this, in);
register_z3_replayer_cmds(*this); register_z3_replayer_cmds(*this);
} }
z3_replayer::~z3_replayer() { z3_replayer::~z3_replayer() {
dealloc(m_imp); dealloc(m_imp);
} }