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

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

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2015-06-02 19:00:15 +01:00
commit 5c67db8dc6
4 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/math/realclosure/realclosure.cpp
View file

@ -4075,7 +4075,7 @@ namespace realclosure {
void refine_rational_interval(rational_value * v, unsigned prec) {
mpbqi & i = interval(v);
if (!i.lower_is_open() && !i.lower_is_open()) {
if (!i.lower_is_open() && !i.upper_is_open()) {
SASSERT(bqm().eq(i.lower(), i.upper()));
return;
}

2
src/muz/rel/dl_relation_manager.cpp
View file

@ -108,7 +108,7 @@ namespace datalog {
void relation_manager::store_relation(func_decl * pred, relation_base * rel) {
SASSERT(rel);
relation_map::entry * e = m_relations.insert_if_not_there2(pred, 0);
relation_map::obj_map_entry * e = m_relations.insert_if_not_there2(pred, 0);
if (e->get_data().m_value) {
e->get_data().m_value->deallocate();
}

2
src/muz/rel/dl_relation_manager.h
View file

@ -73,7 +73,7 @@ namespace datalog {
typedef map<const relation_plugin *, finite_product_relation_plugin *, ptr_hash<const relation_plugin>,
ptr_eq<const relation_plugin> > rp2fprp_map;
typedef map<func_decl *, relation_base *, ptr_hash<func_decl>, ptr_eq<func_decl> > relation_map;
typedef obj_map<func_decl, relation_base *> relation_map;
typedef ptr_vector<table_plugin> table_plugin_vector;
typedef ptr_vector<relation_plugin> relation_plugin_vector;

3
src/shell/main.cpp
View file

@ -163,6 +163,9 @@ void parse_cmd_line_args(int argc, char ** argv) {
else if (strcmp(opt_name, "smt2") == 0) {
g_input_kind = IN_SMTLIB_2;
}
else if (strcmp(opt_name, "dl") == 0) {
g_input_kind = IN_DATALOG;
}
else if (strcmp(opt_name, "in") == 0) {
g_standard_input = true;
}