From fbee36d035eecf1c7a25e38e601a621913254a8a Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Mon, 4 Jan 2016 20:42:07 -0800 Subject: [PATCH 1/6] remove debug asserts Signed-off-by: Nikolaj Bjorner --- src/muz/rel/dl_mk_simple_joins.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/muz/rel/dl_mk_simple_joins.cpp b/src/muz/rel/dl_mk_simple_joins.cpp index d3c92b08c..b9febe53e 100644 --- a/src/muz/rel/dl_mk_simple_joins.cpp +++ b/src/muz/rel/dl_mk_simple_joins.cpp @@ -302,8 +302,6 @@ namespace datalog { } void remove_rule_from_pair(app_pair key, rule * r, unsigned original_len) { - SASSERT(m_costs.contains(key)); - SASSERT(m_costs.find(key)); pair_info * ptr = 0; if (m_costs.find(key, ptr) && ptr && ptr->remove_rule(r, original_len)) { From c008c2c274fb56903a308d5173389a1b6946e912 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Mon, 4 Jan 2016 22:36:50 -0800 Subject: [PATCH 2/6] fix indentation error Signed-off-by: Nikolaj Bjorner --- src/api/python/z3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From a2fb4fc589d54ff776ec9b20a0849b9926fbb345 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Mon, 4 Jan 2016 22:49:28 -0800 Subject: [PATCH 3/6] remove tabs, fix build Signed-off-by: Nikolaj Bjorner --- src/api/python/z3printer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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: From a06f754683c04ecf8cf502b8c3c0df1384a317a3 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Tue, 5 Jan 2016 03:31:21 -0800 Subject: [PATCH 4/6] tabs --- src/api/python/z3printer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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: From bc123dc79b865dcacdb6993e684a34c3befaea11 Mon Sep 17 00:00:00 2001 From: Nuno Lopes Date: Tue, 5 Jan 2016 14:10:32 +0000 Subject: [PATCH 5/6] fix build with c++98 compilers --- src/math/automata/automaton.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: "; From 465d28e160700580c31078f0c5548c3622d5b1ec Mon Sep 17 00:00:00 2001 From: Nuno Lopes Date: Tue, 5 Jan 2016 14:57:41 +0000 Subject: [PATCH 6/6] seq_decl: fix build with stricter compilers get rid of 32 rellocations as a nice side-effect --- src/ast/seq_decl_plugin.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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);