mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 17:44:08 +00:00
Code Activity

Fixed x86/x64 issues in theory_str

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2017-06-28 12:49:10 +01:00
parent ac519f5656
commit 1a59123819
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/smt/theory_str.cpp
View file

@ -21,14 +21,13 @@
#include"ast_pp.h" #include"ast_pp.h"
#include"ast_ll_pp.h" #include"ast_ll_pp.h"
#include<list> #include<list>
#include<vector>
#include<algorithm> #include<algorithm>
#include"theory_seq_empty.h" #include"theory_seq_empty.h"
#include"theory_arith.h" #include"theory_arith.h"
#include"ast_util.h" #include"ast_util.h"
namespace smt { namespace smt {
theory_str::theory_str(ast_manager & m, theory_str_params const & params): theory_str::theory_str(ast_manager & m, theory_str_params const & params):
theory(m.mk_family_id("seq")), theory(m.mk_family_id("seq")),
m_params(params), m_params(params),
@ -99,7 +98,7 @@ namespace smt {
if (defaultCharset) { if (defaultCharset) {
// valid C strings can't contain the null byte ('\0') // valid C strings can't contain the null byte ('\0')
charSetSize = 255; charSetSize = 255;
char_set.resize(256, 0); char_set.resize(256, 0);
int idx = 0; int idx = 0;
// small letters // small letters
for (int i = 97; i < 123; i++) { for (int i = 97; i < 123; i++) {
@ -9217,8 +9216,8 @@ namespace smt {
coverAll = get_next_val_encode(val_range_map[lastestValIndi], base); coverAll = get_next_val_encode(val_range_map[lastestValIndi], base);
} }
long long l = (tries) * distance; size_t l = (tries) * distance;
long long h = l; size_t h = l;
for (int i = 0; i < distance; i++) { for (int i = 0; i < distance; i++) {
if (coverAll) if (coverAll)
break; break;
@ -9239,10 +9238,10 @@ namespace smt {
); );
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
expr_ref_vector orList(m), andList(m); expr_ref_vector orList(m), andList(m);
for (long long i = l; i < h; i++) { for (size_t i = l; i < h; i++) {
orList.push_back(m.mk_eq(val_indicator, mk_string(longlong_to_string(i).c_str()) )); orList.push_back(m.mk_eq(val_indicator, mk_string(longlong_to_string(i).c_str()) ));
if (m_params.m_AggressiveValueTesting) { if (m_params.m_AggressiveValueTesting) {
literal lit = mk_eq(val_indicator, mk_string(longlong_to_string(i).c_str()), false); literal lit = mk_eq(val_indicator, mk_string(longlong_to_string(i).c_str()), false);