diff --git a/src/api/python/z3.py b/src/api/python/z3.py index 1a9ef204b..695ee9632 100644 --- a/src/api/python/z3.py +++ b/src/api/python/z3.py @@ -3576,7 +3576,7 @@ def Concat(*args): if __debug__: _z3_assert(all([is_seq(a) for a in args]), "All arguments must be sequence expressions.") v = (Ast * sz)() - for i in range(sz): + for i in range(sz): v[i] = args[i].as_ast() return SeqRef(Z3_mk_seq_concat(ctx.ref(), sz, v), ctx) diff --git a/src/api/python/z3printer.py b/src/api/python/z3printer.py index 24d0359c9..1561e6667 100644 --- a/src/api/python/z3printer.py +++ b/src/api/python/z3printer.py @@ -571,7 +571,7 @@ class Formatter: return to_format(a.as_decimal(self.precision)) def pp_string(self, a): - return to_format(a.as_string()) + return to_format(a.as_string()) def pp_bv(self, a): return to_format(a.as_string()) @@ -878,8 +878,8 @@ class Formatter: return self.pp_fp_value(a) elif z3.is_fp(a): return self.pp_fp(a, d, xs) - elif z3.is_string_value(a): - return self.pp_string(a) + elif z3.is_string_value(a): + return self.pp_string(a) elif z3.is_const(a): return self.pp_const(a) else: diff --git a/src/ast/seq_decl_plugin.cpp b/src/ast/seq_decl_plugin.cpp index 44901b506..9c8a085e8 100644 --- a/src/ast/seq_decl_plugin.cpp +++ b/src/ast/seq_decl_plugin.cpp @@ -80,8 +80,9 @@ zstring zstring::replace(zstring const& src, zstring const& dst) const { return result; } -static char* esc_table[32] = { "\\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","^\\","^]","^^","^_"}; +static const char esc_table[32][3] = + { "\\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 { SASSERT(m_encoding == ascii); diff --git a/src/math/automata/automaton.h b/src/math/automata/automaton.h index 2a4c964f9..e7d7c8bfb 100644 --- a/src/math/automata/automaton.h +++ b/src/math/automata/automaton.h @@ -476,7 +476,7 @@ public: get_moves(state, m_delta_inv, mvs, epsilon_closure); } - template + template std::ostream& display(std::ostream& out, D& displayer = D()) const { out << "init: " << init() << "\n"; out << "final: ";