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

remove python_install target from all

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-12-07 09:59:46 -08:00
parent 2a0bbad524
commit 34a0d7dfed
8 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/mk_util.py
View file

@ -1346,16 +1346,16 @@ class PythonInstallComponent(Component):
Component.__init__(self, name, None, [])
def main_component(self):
return is_python_install_enabled()
return False
def install_deps(self, out):
if not self.main_component():
return
if not is_python_install_enabled():
return
pythonPkgDirWithoutPrefix = strip_path_prefix(PYTHON_PACKAGE_DIR, PREFIX)
MakeRuleCmd.make_install_directory(out, pythonPkgDirWithoutPrefix)
def mk_install(self, out):
if not self.main_component():
if not is_python_install_enabled():
return
MakeRuleCmd.install_files(out, 'z3*.py', pythonPkgDirWithoutPrefix)
if sys.version >= "3":
@ -1374,7 +1374,7 @@ class PythonInstallComponent(Component):
out.write('\t@echo Z3Py was installed at \'%s\', make sure this directory is in your PYTHONPATH environment variable.' % PYTHON_PACKAGE_DIR)
def mk_uninstall(self, out):
if not self.main_component():
if not is_python_install_enabled():
return
pythonPkgDirWithoutPrefix = strip_path_prefix(PYTHON_PACKAGE_DIR, PREFIX)
MakeRuleCmd.remove_installed_files(out, '{}*.py'.format(os.path.join(pythonPkgDirWithoutPrefix, 'z3')))

6
src/smt/arith_eq_adapter.cpp
View file

@ -289,9 +289,9 @@ namespace smt {
void arith_eq_adapter::restart_eh() {
context & ctx = get_context();
TRACE("arith_eq_adapter", tout << "restart\n";);
svector<enode_pair> tmp(m_restart_pairs);
svector<enode_pair>::iterator it = tmp.begin();
svector<enode_pair>::iterator end = tmp.end();
enode_pair_vector tmp(m_restart_pairs);
enode_pair_vector::iterator it = tmp.begin();
enode_pair_vector::iterator end = tmp.end();
m_restart_pairs.reset();
for (; it != end && !ctx.inconsistent(); ++it) {
TRACE("arith_eq_adapter", tout << "creating arith_eq_adapter axioms at the base level #" << it->first->get_owner_id() << " #" <<

2
src/smt/arith_eq_adapter.h
View file

@ -68,7 +68,7 @@ namespace smt {
arith_simplifier_plugin * m_as;
already_processed m_already_processed;
svector<enode_pair> m_restart_pairs;
enode_pair_vector m_restart_pairs;
svector<parameter> m_proof_hint;
context & get_context() const { return m_owner.get_context(); }

1
src/smt/smt_types.h
View file

@ -45,6 +45,7 @@ namespace smt {
class enode;
typedef ptr_vector<enode> enode_vector;
typedef std::pair<enode *, enode *> enode_pair;
typedef svector<enode_pair> enode_pair_vector;
class context;

10
src/smt/theory_array_base.cpp
View file

@ -712,7 +712,7 @@ namespace smt {
}
}
void theory_array_base::propagate_select_to_store_parents(enode * r, enode * sel, svector<enode_pair> & todo) {
void theory_array_base::propagate_select_to_store_parents(enode * r, enode * sel, enode_pair_vector & todo) {
SASSERT(r->get_root() == r);
SASSERT(is_select(sel));
if (!get_context().is_relevant(r)) {
@ -751,7 +751,7 @@ namespace smt {
}
}
void theory_array_base::propagate_selects_to_store_parents(enode * r, svector<enode_pair> & todo) {
void theory_array_base::propagate_selects_to_store_parents(enode * r, enode_pair_vector & todo) {
select_set * sel_set = get_select_set(r);
select_set::iterator it2 = sel_set->begin();
select_set::iterator end2 = sel_set->end();
@ -763,9 +763,9 @@ namespace smt {
}
void theory_array_base::propagate_selects() {
svector<enode_pair> todo;
ptr_vector<enode>::const_iterator it = m_selects_domain.begin();
ptr_vector<enode>::const_iterator end = m_selects_domain.end();
enode_pair_vector todo;
enode_vector::const_iterator it = m_selects_domain.begin();
enode_vector::const_iterator end = m_selects_domain.end();
for (; it != end; ++it) {
enode * r = *it;
propagate_selects_to_store_parents(r, todo);

8
src/smt/theory_array_base.h
View file

@ -58,8 +58,8 @@ namespace smt {
unsigned get_dimension(sort* s) const;
ptr_vector<enode> m_axiom1_todo;
svector<std::pair<enode*, enode*> > m_axiom2_todo;
svector<std::pair<enode*, enode*> > m_extensionality_todo;
enode_pair_vector m_axiom2_todo;
enode_pair_vector m_extensionality_todo;
void assert_axiom(unsigned num_lits, literal * lits);
void assert_axiom(literal l1, literal l2);
@ -181,8 +181,8 @@ namespace smt {
bool is_unspecified_default_ok() const;
void collect_defaults();
void collect_selects();
void propagate_select_to_store_parents(enode * r, enode * sel, svector<enode_pair> & todo);
void propagate_selects_to_store_parents(enode * r, svector<enode_pair> & todo);
void propagate_select_to_store_parents(enode * r, enode * sel, enode_pair_vector & todo);
void propagate_selects_to_store_parents(enode * r, enode_pair_vector & todo);
void propagate_selects();
select_set * get_select_set(enode * n);
virtual void finalize_model(model_generator & m);

6
src/smt/theory_datatype.cpp
View file

@ -438,8 +438,8 @@ namespace smt {
ctx.set_conflict(ctx.mk_justification(ext_theory_conflict_justification(get_id(), r, 0, 0, m_used_eqs.size(), m_used_eqs.c_ptr())));
TRACE("occurs_check",
tout << "occurs_check: true\n";
svector<enode_pair>::const_iterator it = m_used_eqs.begin();
svector<enode_pair>::const_iterator end = m_used_eqs.end();
enode_pair_vector::const_iterator it = m_used_eqs.begin();
enode_pair_vector::const_iterator end = m_used_eqs.end();
for(; it != end; ++it) {
enode_pair const & p = *it;
tout << "eq: #" << p.first->get_owner_id() << " #" << p.second->get_owner_id() << "\n";
@ -675,7 +675,7 @@ namespace smt {
CTRACE("datatype", d->m_recognizers.empty(), ctx.display(tout););
SASSERT(!d->m_recognizers.empty());
literal_vector lits;
svector<enode_pair> eqs;
enode_pair_vector eqs;
ptr_vector<enode>::const_iterator it = d->m_recognizers.begin();
ptr_vector<enode>::const_iterator end = d->m_recognizers.end();
for (unsigned idx = 0; it != end; ++it, ++idx) {

2
src/smt/theory_datatype.h
View file

@ -74,7 +74,7 @@ namespace smt {
void sign_recognizer_conflict(enode * c, enode * r);
ptr_vector<enode> m_to_unmark;
svector<enode_pair> m_used_eqs;
enode_pair_vector m_used_eqs;
enode * m_main;
bool occurs_check(enode * n);
bool occurs_check_core(enode * n);