mirror of
https://github.com/Z3Prover/z3
synced 2025-06-04 05:11:21 +00:00
Merge pull request #117 from mschlaipfer/unstable
Missing input format option "-dl" and non-deterministic behaviour in fixpoint engine
This commit is contained in:
commit
171ef5c8e3
3 changed files with 5 additions and 2 deletions
|
@ -108,7 +108,7 @@ namespace datalog {
|
||||||
|
|
||||||
void relation_manager::store_relation(func_decl * pred, relation_base * rel) {
|
void relation_manager::store_relation(func_decl * pred, relation_base * rel) {
|
||||||
SASSERT(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) {
|
if (e->get_data().m_value) {
|
||||||
e->get_data().m_value->deallocate();
|
e->get_data().m_value->deallocate();
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,7 +73,7 @@ namespace datalog {
|
||||||
typedef map<const relation_plugin *, finite_product_relation_plugin *, ptr_hash<const relation_plugin>,
|
typedef map<const relation_plugin *, finite_product_relation_plugin *, ptr_hash<const relation_plugin>,
|
||||||
ptr_eq<const relation_plugin> > rp2fprp_map;
|
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<table_plugin> table_plugin_vector;
|
||||||
typedef ptr_vector<relation_plugin> relation_plugin_vector;
|
typedef ptr_vector<relation_plugin> relation_plugin_vector;
|
||||||
|
|
||||||
|
|
|
@ -163,6 +163,9 @@ void parse_cmd_line_args(int argc, char ** argv) {
|
||||||
else if (strcmp(opt_name, "smt2") == 0) {
|
else if (strcmp(opt_name, "smt2") == 0) {
|
||||||
g_input_kind = IN_SMTLIB_2;
|
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) {
|
else if (strcmp(opt_name, "in") == 0) {
|
||||||
g_standard_input = true;
|
g_standard_input = true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue