mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

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

Browse source
This commit is contained in:
Nuno Lopes 2015-07-08 13:39:26 +01:00
commit 5703abd3f1
12 changed files with 118 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/muz/base/hnf.cpp
View file

@ -112,6 +112,12 @@ public:
expr* n1, *n2;
while (is_forall(n)) n = to_quantifier(n)->get_expr();
if (m.is_implies(n, n1, n2) && is_predicate(n2)) {
if (is_var(n1)) {
return true;
}
if (is_quantifier(n1)) {
return false;
}
app* a1 = to_app(n1);
if (m.is_and(a1)) {
for (unsigned i = 0; i < a1->get_num_args(); ++i) {

31
src/muz/fp/datalog_parser.cpp
View file

@ -665,7 +665,7 @@ protected:
dtoken unexpected(dtoken tok, char const* msg) {
#if 1
throw default_exception("%s at line %u '%s' found '%s'\n", msg,
throw default_exception(default_exception::fmt(), "%s at line %u '%s' found '%s'\n", msg,
m_lexer->get_line(), m_lexer->get_token_data(), dtoken_strings[tok]);
SASSERT(false);
@ -958,7 +958,7 @@ protected:
m_vars.insert(data.bare_str(), v);
}
else if (s != m_manager.get_sort(v)) {
throw default_exception("sort: %s expected, but got: %s\n",
throw default_exception(default_exception::fmt(), "sort: %s expected, but got: %s\n",
s->get_name().bare_str(), m_manager.get_sort(v)->get_name().bare_str());
}
args.push_back(v);
@ -1074,7 +1074,7 @@ protected:
sort * register_finite_sort(symbol name, uint64 domain_size, context::sort_kind k) {
if(m_sort_dict.contains(name.bare_str())) {
throw default_exception("sort %s already declared", name.bare_str());
throw default_exception(default_exception::fmt(), "sort %s already declared", name.bare_str());
}
sort * s = m_decl_util.mk_sort(name, domain_size);
m_context.register_finite_sort(s, k);
@ -1084,7 +1084,7 @@ protected:
sort * register_int_sort(symbol name) {
if(m_sort_dict.contains(name.bare_str())) {
throw default_exception("sort %s already declared", name.bare_str());
throw default_exception(default_exception::fmt(), "sort %s already declared", name.bare_str());
}
sort * s = m_arith.mk_int();
m_sort_dict.insert(name.bare_str(), s);
@ -1094,7 +1094,7 @@ protected:
sort * get_sort(const char* str) {
sort * res;
if(!m_sort_dict.find(str, res)) {
throw default_exception("unknown sort \"%s\"", str);
throw default_exception(default_exception::fmt(), "unknown sort \"%s\"", str);
}
return res;
}
@ -1104,7 +1104,7 @@ protected:
if(m_arith.is_int(s)) {
uint64 val;
if(!string_to_uint64(name.bare_str(), val)) {
throw default_exception("Invalid integer: \"&s\"", name.bare_str());
throw default_exception(default_exception::fmt(), "Invalid integer: \"%s\"", name.bare_str());
}
res = m_arith.mk_numeral(rational(val, rational::ui64()), s);
}
@ -1295,7 +1295,7 @@ private:
if(num==0) {
const_name = symbol("<zero element>");
} else if(!m_number_names.find(num, const_name)) {
throw default_exception("unknown symbol number %I64u on line %d in file %s",
throw default_exception(default_exception::fmt(), "unknown symbol number %I64u on line %d in file %s",
num, m_current_line, m_current_file.c_str());
}
res = mk_table_const(const_name, s);
@ -1334,12 +1334,13 @@ private:
}
uint64 num;
if(!read_uint64(ptr, num)) {
throw default_exception("number expected on line %d in file %s",
throw default_exception(default_exception::fmt(), "number expected on line %d in file %s",
m_current_line, m_current_file.c_str());
}
if(*ptr!=' ' && *ptr!=0) {
throw default_exception("' ' expected to separate numbers on line %d in file %s, got '%s'",
m_current_line, m_current_file.c_str(), ptr);
throw default_exception(default_exception::fmt(),
"' ' expected to separate numbers on line %d in file %s, got '%s'",
m_current_line, m_current_file.c_str(), ptr);
}
args.push_back(num);
} while(!last);
@ -1359,7 +1360,7 @@ private:
func_decl * pred = m_context.try_get_predicate_decl(predicate_name);
if(!pred) {
throw default_exception("tuple file %s for undeclared predicate %s",
throw default_exception(default_exception::fmt(), "tuple file %s for undeclared predicate %s",
m_current_file.c_str(), predicate_name.bare_str());
}
unsigned pred_arity = pred->get_arity();
@ -1381,7 +1382,7 @@ private:
continue;
}
if(args.size()!=pred_arity) {
throw default_exception("invalid number of arguments on line %d in file %s",
throw default_exception(default_exception::fmt(), "invalid number of arguments on line %d in file %s",
m_current_line, m_current_file.c_str());
}
@ -1450,10 +1451,12 @@ private:
const char * ptr = full_line;
if(!read_uint64(ptr, num)) {
throw default_exception("number expected at line %d in file %s", m_current_line, m_current_file.c_str());
throw default_exception(default_exception::fmt(),
"number expected at line %d in file %s", m_current_line, m_current_file.c_str());
}
if(*ptr!=' ') {
throw default_exception("' ' expected after the number at line %d in file %s", m_current_line, m_current_file.c_str());
throw default_exception(default_exception::fmt(),
"' ' expected after the number at line %d in file %s", m_current_line, m_current_file.c_str());
}
ptr++;

20
src/muz/rel/dl_instruction.cpp
View file

@ -385,8 +385,9 @@ namespace datalog {
if (!find_fn(r1, r2, fn)) {
fn = r1.get_manager().mk_join_fn(r1, r2, m_cols1, m_cols2);
if (!fn) {
throw default_exception("trying to perform unsupported join operation on relations of kinds %s and %s",
r1.get_plugin().get_name().bare_str(), r2.get_plugin().get_name().bare_str());
throw default_exception(default_exception::fmt(),
"trying to perform unsupported join operation on relations of kinds %s and %s",
r1.get_plugin().get_name().bare_str(), r2.get_plugin().get_name().bare_str());
}
store_fn(r1, r2, fn);
}
@ -447,7 +448,7 @@ namespace datalog {
if (!find_fn(r, fn)) {
fn = r.get_manager().mk_filter_equal_fn(r, m_value, m_col);
if (!fn) {
throw default_exception(
throw default_exception(default_exception::fmt(),
"trying to perform unsupported filter_equal operation on a relation of kind %s",
r.get_plugin().get_name().bare_str());
}
@ -496,7 +497,7 @@ namespace datalog {
if (!find_fn(r, fn)) {
fn = r.get_manager().mk_filter_identical_fn(r, m_cols.size(), m_cols.c_ptr());
if (!fn) {
throw default_exception(
throw default_exception(default_exception::fmt(),
"trying to perform unsupported filter_identical operation on a relation of kind %s",
r.get_plugin().get_name().bare_str());
}
@ -542,7 +543,7 @@ namespace datalog {
if (!find_fn(r, fn)) {
fn = r.get_manager().mk_filter_interpreted_fn(r, m_cond);
if (!fn) {
throw default_exception(
throw default_exception(default_exception::fmt(),
"trying to perform unsupported filter_interpreted operation on a relation of kind %s",
r.get_plugin().get_name().bare_str());
}
@ -598,7 +599,7 @@ namespace datalog {
if (!find_fn(reg, fn)) {
fn = reg.get_manager().mk_filter_interpreted_and_project_fn(reg, m_cond, m_cols.size(), m_cols.c_ptr());
if (!fn) {
throw default_exception(
throw default_exception(default_exception::fmt(),
"trying to perform unsupported filter_interpreted_and_project operation on a relation of kind %s",
reg.get_plugin().get_name().bare_str());
}
@ -838,7 +839,8 @@ namespace datalog {
if (!find_fn(r1, r2, fn)) {
fn = r1.get_manager().mk_join_project_fn(r1, r2, m_cols1, m_cols2, m_removed_cols);
if (!fn) {
throw default_exception("trying to perform unsupported join-project operation on relations of kinds %s and %s",
throw default_exception(default_exception::fmt(),
"trying to perform unsupported join-project operation on relations of kinds %s and %s",
r1.get_plugin().get_name().bare_str(), r2.get_plugin().get_name().bare_str());
}
store_fn(r1, r2, fn);
@ -905,7 +907,7 @@ namespace datalog {
const relation_base & s = *ctx.reg(m_source_reg);
if (!s.from_table()) {
throw default_exception("relation is not a table %s",
throw default_exception(default_exception::fmt(), "relation is not a table %s",
s.get_plugin().get_name().bare_str());
}
++ctx.m_stats.m_min;
@ -963,7 +965,7 @@ namespace datalog {
if (!find_fn(r, fn)) {
fn = r.get_manager().mk_select_equal_and_project_fn(r, m_value, m_col);
if (!fn) {
throw default_exception(
throw default_exception(default_exception::fmt(),
"trying to perform unsupported select_equal_and_project operation on a relation of kind %s",
r.get_plugin().get_name().bare_str());
}