3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00

Merge branch 'master' of https://github.com/z3prover/z3 into polysat

This commit is contained in:
Nikolaj Bjorner 2021-08-04 14:02:41 -07:00
commit 0249d009f1
109 changed files with 1692 additions and 1097 deletions

View file

@ -260,6 +260,7 @@ void mpq_manager<SYNCH>::set(mpq & a, char const * val) {
if (exp > 0) {
_scoped_numeral<mpq_manager<SYNCH>> _exp(*this);
_scoped_numeral<mpq_manager<SYNCH>> _qten(*this);
_qten = 10;
power(_qten, static_cast<unsigned>(exp), _exp);
TRACE("mpq_set", tout << "a: " << to_string(a) << ", exp_sign:" << exp_sign << ", exp: " << exp << " " << to_string(_exp) << std::endl;);
if (exp_sign)

View file

@ -185,8 +185,10 @@ void sexpr::display_atom(std::ostream & out) const {
}
void sexpr::display(std::ostream & out) const {
if (!is_composite())
if (!is_composite()) {
display_atom(out);
return;
}
vector<std::pair<sexpr_composite const *, unsigned> > todo;
todo.push_back(std::make_pair(static_cast<sexpr_composite const *>(this), 0));
while (!todo.empty()) {