mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-14 14:55:25 +00:00
Code Activity

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

Browse source
This commit is contained in:
Nikolaj Bjorner 2016-01-05 08:23:50 -08:00
commit b0d244c1e0
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/api/python/z3.py
View file

@ -3576,7 +3576,7 @@ def Concat(*args):
if __debug__: if __debug__:
_z3_assert(all([is_seq(a) for a in args]), "All arguments must be sequence expressions.") _z3_assert(all([is_seq(a) for a in args]), "All arguments must be sequence expressions.")
v = (Ast * sz)() v = (Ast * sz)()
for i in range(sz): for i in range(sz):
v[i] = args[i].as_ast() v[i] = args[i].as_ast()
return SeqRef(Z3_mk_seq_concat(ctx.ref(), sz, v), ctx) return SeqRef(Z3_mk_seq_concat(ctx.ref(), sz, v), ctx)

6
src/api/python/z3printer.py
View file

@ -571,7 +571,7 @@ class Formatter:
return to_format(a.as_decimal(self.precision)) return to_format(a.as_decimal(self.precision))
def pp_string(self, a): def pp_string(self, a):
return to_format(a.as_string()) return to_format(a.as_string())
def pp_bv(self, a): def pp_bv(self, a):
return to_format(a.as_string()) return to_format(a.as_string())
@ -878,8 +878,8 @@ class Formatter:
return self.pp_fp_value(a) return self.pp_fp_value(a)
elif z3.is_fp(a): elif z3.is_fp(a):
return self.pp_fp(a, d, xs) return self.pp_fp(a, d, xs)
elif z3.is_string_value(a): elif z3.is_string_value(a):
return self.pp_string(a) return self.pp_string(a)
elif z3.is_const(a): elif z3.is_const(a):
return self.pp_const(a) return self.pp_const(a)
else: else:

5
src/ast/seq_decl_plugin.cpp
View file

@ -80,8 +80,9 @@ zstring zstring::replace(zstring const& src, zstring const& dst) const {
return result; return result;
} }
static char* esc_table[32] = { "\\0", "^A", "^B", "^C", "^D", "^E", "^F", "\\a", "\\b", "\\t", "\\n", "\\v", "\\f", "\\r", "^N", static const char esc_table[32][3] =
"^O", "^P", "^Q", "^R", "^S", "^T", "^U", "^V","^W","^X","^Y","^Z","\\e","^\\","^]","^^","^_"}; { "\\0", "^A", "^B", "^C", "^D", "^E", "^F", "\\a", "\\b", "\\t", "\\n", "\\v", "\\f", "\\r", "^N",
"^O", "^P", "^Q", "^R", "^S", "^T", "^U", "^V","^W","^X","^Y","^Z","\\e","^\\","^]","^^","^_"};
std::string zstring::encode() const { std::string zstring::encode() const {
SASSERT(m_encoding == ascii); SASSERT(m_encoding == ascii);

2
src/math/automata/automaton.h
View file

@ -476,7 +476,7 @@ public:
get_moves(state, m_delta_inv, mvs, epsilon_closure); get_moves(state, m_delta_inv, mvs, epsilon_closure);
} }
template<class D = default_display> template<class D>
std::ostream& display(std::ostream& out, D& displayer = D()) const { std::ostream& display(std::ostream& out, D& displayer = D()) const {
out << "init: " << init() << "\n"; out << "init: " << init() << "\n";
out << "final: "; out << "final: ";