mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

merge

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-08-02 10:41:53 -07:00
commit 51610842b9
6 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/api/z3_logger.h
View file

@ -42,6 +42,7 @@ static void __declspec(noinline) Sy(Z3_symbol sym) {
}
static void __declspec(noinline) Ap(unsigned sz) { *g_z3_log << "p " << sz << "\n"; g_z3_log->flush(); }
static void __declspec(noinline) Au(unsigned sz) { *g_z3_log << "u " << sz << "\n"; g_z3_log->flush(); }
static void __declspec(noinline) Ai(unsigned sz) { *g_z3_log << "i " << sz << "\n"; g_z3_log->flush(); }
static void __declspec(noinline) Asy(unsigned sz) { *g_z3_log << "s " << sz << "\n"; g_z3_log->flush(); }
static void __declspec(noinline) C(unsigned id) { *g_z3_log << "C " << id << "\n"; g_z3_log->flush(); }
void __declspec(noinline) _Z3_append_log(char const * msg) { *g_z3_log << "M \"" << ll_escaped(msg) << "\"\n"; g_z3_log->flush(); }

8
src/api/z3_replayer.cpp
View file

@ -78,6 +78,7 @@ struct z3_replayer::imp {
std::stringstream strm;
strm << "expecting " << kind2string(k) << " at position "
<< pos << " but got " << kind2string(m_args[pos].m_kind);
TRACE("z3_replayer", tout << strm.str() << "\n";);
throw z3_replayer_exception(strm.str().c_str());
}
}
@ -186,10 +187,10 @@ struct z3_replayer::imp {
sz++;
}
else {
throw z3_replayer_exception("invalid scaped character");
throw z3_replayer_exception("invalid escaped character");
}
if (val > 255)
throw z3_replayer_exception("invalid scaped character");
throw z3_replayer_exception("invalid escaped character");
next();
}
TRACE("z3_replayer_escape", tout << "val: " << val << "\n";);
@ -497,6 +498,7 @@ struct z3_replayer::imp {
case 'p':
case 's':
case 'u':
case 'i':
// push array
next(); skip_blank(); read_uint64();
TRACE("z3_replayer", tout << "[" << m_line << "] " << "A " << m_uint64 << "\n";);
@ -504,6 +506,8 @@ struct z3_replayer::imp {
push_array(static_cast<unsigned>(m_uint64), OBJECT);
else if (c == 's')
push_array(static_cast<unsigned>(m_uint64), SYMBOL);
else if (c == 'i')
push_array(static_cast<unsigned>(m_uint64), INT64);
else
push_array(static_cast<unsigned>(m_uint64), UINT64);
break;