mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-20 04:43:39 +00:00
Code Activity

use signed char per porting issue for ARM/64

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-06-02 15:53:32 -07:00
parent cccd37101e
commit 1d46d5c870
5 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/z3_replayer.cpp
View file

@ -36,7 +36,7 @@ void throw_invalid_reference() {
struct z3_replayer::imp { struct z3_replayer::imp {
z3_replayer & m_owner; z3_replayer & m_owner;
std::istream & m_stream; std::istream & m_stream;
char m_curr; // current char; signed char m_curr; // current char;
int m_line; // line int m_line; // line
svector<char> m_string; svector<char> m_string;
symbol m_id; symbol m_id;
@ -158,7 +158,7 @@ struct z3_replayer::imp {
} }
} }
char curr() const { return m_curr; } signed char curr() const { return m_curr; }
void new_line() { m_line++; } void new_line() { m_line++; }
void next() { m_curr = m_stream.get(); } void next() { m_curr = m_stream.get(); }
@ -168,7 +168,7 @@ struct z3_replayer::imp {
m_string.reset(); m_string.reset();
next(); next();
while (true) { while (true) {
char c = curr(); signed char c = curr();
if (c == EOF) { if (c == EOF) {
throw z3_replayer_exception("unexpected end of file"); throw z3_replayer_exception("unexpected end of file");
} }

22
src/parsers/util/scanner.cpp
View file

@ -18,7 +18,7 @@ Revision History:
--*/ --*/
#include "parsers/util/scanner.h" #include "parsers/util/scanner.h"
inline char scanner::read_char() { inline signed char scanner::read_char() {
if (m_is_interactive) { if (m_is_interactive) {
++m_pos; ++m_pos;
return m_stream.get(); return m_stream.get();
@ -58,7 +58,7 @@ inline bool scanner::state_ok() {
void scanner::comment(char delimiter) { void scanner::comment(char delimiter) {
while(state_ok()) { while(state_ok()) {
char ch = read_char(); signed char ch = read_char();
if ('\n' == ch) { if ('\n' == ch) {
++m_line; ++m_line;
} }
@ -68,7 +68,7 @@ void scanner::comment(char delimiter) {
} }
} }
scanner::token scanner::read_symbol(char ch) { scanner::token scanner::read_symbol(signed char ch) {
bool escape = false; bool escape = false;
if (m_smt2) if (m_smt2)
m_string.pop_back(); // remove leading '|' m_string.pop_back(); // remove leading '|'
@ -94,7 +94,7 @@ scanner::token scanner::read_symbol(char ch) {
scanner::token scanner::read_id(char first_char) { scanner::token scanner::read_id(char first_char) {
char ch; signed char ch;
m_string.reset(); m_string.reset();
m_params.reset(); m_params.reset();
m_string.push_back(first_char); m_string.push_back(first_char);
@ -159,7 +159,7 @@ bool scanner::read_params() {
unsigned param_num = 0; unsigned param_num = 0;
while (state_ok()) { while (state_ok()) {
char ch = read_char(); signed char ch = read_char();
switch (m_normalized[(unsigned char) ch]) { switch (m_normalized[(unsigned char) ch]) {
case '0': case '0':
param_num = 10*param_num + (ch - '0'); param_num = 10*param_num + (ch - '0');
@ -208,7 +208,7 @@ scanner::token scanner::read_number(char first_char, bool is_pos) {
m_state = INT_TOKEN; m_state = INT_TOKEN;
while (true) { while (true) {
char ch = read_char(); signed char ch = read_char();
if (m_normalized[(unsigned char) ch] == '0') { if (m_normalized[(unsigned char) ch] == '0') {
m_number = rational(10)*m_number + rational(ch - '0'); m_number = rational(10)*m_number + rational(ch - '0');
if (m_state == FLOAT_TOKEN) { if (m_state == FLOAT_TOKEN) {
@ -236,7 +236,7 @@ scanner::token scanner::read_string(char delimiter, token result) {
m_string.reset(); m_string.reset();
m_params.reset(); m_params.reset();
while (true) { while (true) {
char ch = read_char(); signed char ch = read_char();
if (!state_ok()) { if (!state_ok()) {
return m_state; return m_state;
@ -265,7 +265,7 @@ scanner::token scanner::read_string(char delimiter, token result) {
scanner::token scanner::read_bv_literal() { scanner::token scanner::read_bv_literal() {
TRACE("scanner", tout << "read_bv_literal\n";); TRACE("scanner", tout << "read_bv_literal\n";);
if (m_bv_token) { if (m_bv_token) {
char ch = read_char(); signed char ch = read_char();
if (ch == 'x') { if (ch == 'x') {
ch = read_char(); ch = read_char();
m_number = rational(0); m_number = rational(0);
@ -315,7 +315,7 @@ scanner::token scanner::read_bv_literal() {
} }
else { else {
// hack for the old parser // hack for the old parser
char ch = read_char(); signed char ch = read_char();
bool is_hex = false; bool is_hex = false;
m_state = ID_TOKEN; m_state = ID_TOKEN;
@ -342,7 +342,7 @@ scanner::token scanner::read_bv_literal() {
} }
while (true) { while (true) {
ch = read_char(); signed ch = read_char();
if (ch == '0' || ch == '1' || if (ch == '0' || ch == '1' ||
(is_hex && (is_hex &&
(('0' <= ch && ch <= '9') || (('0' <= ch && ch <= '9') ||
@ -449,7 +449,7 @@ scanner::scanner(std::istream& stream, std::ostream& err, bool smt2, bool bv_tok
scanner::token scanner::scan() { scanner::token scanner::scan() {
while (state_ok()) { while (state_ok()) {
char ch = read_char(); signed char ch = read_char();
switch (m_normalized[(unsigned char) ch]) { switch (m_normalized[(unsigned char) ch]) {
case ' ': case ' ':
break; break;

8
src/parsers/util/scanner.h
View file

@ -63,7 +63,7 @@ private:
rational m_number; rational m_number;
unsigned m_bv_size; unsigned m_bv_size;
token m_state; token m_state;
char m_normalized[256]; char m_normalized[256];
vector<char> m_string; vector<char> m_string;
std::istream& m_stream; std::istream& m_stream;
std::ostream& m_err; std::ostream& m_err;
@ -71,13 +71,13 @@ private:
buffer<char> m_buffer; buffer<char> m_buffer;
unsigned m_bpos; unsigned m_bpos;
unsigned m_bend; unsigned m_bend;
char m_last_char; char m_last_char;
bool m_is_interactive; bool m_is_interactive;
bool m_smt2; bool m_smt2;
bool m_bv_token; bool m_bv_token;
char read_char(); signed char read_char();
token read_symbol(char ch); token read_symbol(signed char ch);
void unread_char(); void unread_char();
void comment(char delimiter); void comment(char delimiter);
token read_id(char first_char); token read_id(char first_char);

2
src/smt/mam.cpp
View file

@ -79,7 +79,7 @@ namespace smt {
// //
// ------------------------------------ // ------------------------------------
class label_hasher { class label_hasher {
svector<char> m_lbl2hash; // cache: lbl_id -> hash svector<signed char> m_lbl2hash; // cache: lbl_id -> hash
void mk_lbl_hash(unsigned lbl_id) { void mk_lbl_hash(unsigned lbl_id) {
unsigned a = 17; unsigned a = 17;

8
src/smt/theory_seq.cpp
View file

@ -3972,7 +3972,7 @@ public:
else { else {
for (source_t src : m_source) { for (source_t src : m_source) {
switch (src) { switch (src) {
case unit_source: case unit_source:
args.push_back(th.m_util.str.mk_unit(values[j++])); args.push_back(th.m_util.str.mk_unit(values[j++]));
break; break;
case string_source: case string_source:
@ -5130,8 +5130,10 @@ void theory_seq::add_nth_axiom(expr* e) {
add_axiom(mk_eq(ch, e, false)); add_axiom(mk_eq(ch, e, false));
} }
else if (!m_internal_nth_table.contains(e)) { else if (!m_internal_nth_table.contains(e)) {
expr_ref emp(m_util.str.mk_empty(m.get_sort(s)), m); expr_ref zero(m_autil.mk_int(0), m);
add_axiom(mk_eq(s, emp, false), mk_eq(m_util.str.mk_unit(e), m_util.str.mk_at(s, i), false)); literal i_ge_0 = mk_simplified_literal(m_autil.mk_ge(i, zero));
literal i_ge_len_s = mk_simplified_literal(m_autil.mk_ge(mk_sub(i, mk_len(s)), zero));
add_axiom(~i_ge_0, i_ge_len_s, mk_eq(m_util.str.mk_unit(e), m_util.str.mk_at(s, i), false));
} }
} }