From 7e7cdf3635db9d37fb4079d3b755be3323032fe1 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Mon, 1 Apr 2019 12:13:50 -0700 Subject: [PATCH] update dependencies in legacy build system Signed-off-by: Nikolaj Bjorner --- scripts/mk_project.py | 8 ++++---- src/smt/theory_bv.cpp | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/mk_project.py b/scripts/mk_project.py index 2748e30a1..535dbbb10 100644 --- a/scripts/mk_project.py +++ b/scripts/mk_project.py @@ -34,19 +34,19 @@ def init_project_def(): add_lib('parser_util', ['ast'], 'parsers/util') add_lib('grobner', ['ast'], 'math/grobner') add_lib('euclid', ['util'], 'math/euclid') - add_lib('core_tactics', ['tactic', 'macros', 'normal_forms', 'rewriter'], 'tactic/core') add_lib('proofs', ['rewriter', 'util'], 'ast/proofs') add_lib('solver', ['model', 'tactic', 'proofs']) + add_lib('cmd_context', ['solver', 'rewriter']) add_lib('sat_tactic', ['tactic', 'sat', 'solver'], 'sat/tactic') + add_lib('smt2parser', ['cmd_context', 'parser_util'], 'parsers/smt2') + add_lib('pattern', ['normal_forms', 'smt2parser', 'rewriter'], 'ast/pattern') + add_lib('core_tactics', ['tactic', 'macros', 'normal_forms', 'rewriter', 'pattern'], 'tactic/core') add_lib('arith_tactics', ['core_tactics', 'sat'], 'tactic/arith') add_lib('nlsat_tactic', ['nlsat', 'sat_tactic', 'arith_tactics'], 'nlsat/tactic') add_lib('subpaving_tactic', ['core_tactics', 'subpaving'], 'math/subpaving/tactic') add_lib('aig_tactic', ['tactic'], 'tactic/aig') add_lib('ackermannization', ['model', 'rewriter', 'ast', 'solver', 'tactic'], 'ackermannization') - add_lib('cmd_context', ['solver', 'rewriter']) - add_lib('smt2parser', ['cmd_context', 'parser_util'], 'parsers/smt2') add_lib('fpa', ['ast', 'util', 'rewriter', 'model'], 'ast/fpa') - add_lib('pattern', ['normal_forms', 'smt2parser', 'rewriter'], 'ast/pattern') add_lib('bit_blaster', ['rewriter', 'rewriter'], 'ast/rewriter/bit_blaster') add_lib('smt_params', ['ast', 'rewriter', 'pattern', 'bit_blaster'], 'smt/params') add_lib('proto_model', ['model', 'rewriter', 'smt_params'], 'smt/proto_model') diff --git a/src/smt/theory_bv.cpp b/src/smt/theory_bv.cpp index 89b211af6..5fad04f00 100644 --- a/src/smt/theory_bv.cpp +++ b/src/smt/theory_bv.cpp @@ -120,9 +120,10 @@ namespace smt { unsigned idx = n->get_decl()->get_parameter(0).get_int(); SASSERT(a->m_occs == 0); a->m_occs = new (get_region()) var_pos_occ(v_arg, idx); -#if 1 +#if 0 // possible fix for #2182, but effect of fix needs to be checked. if (idx < m_bits[v_arg].size()) { + //std::cout << mk_pp(n, get_manager()) << "\n"; ctx.mk_th_axiom(get_id(), m_bits[v_arg][idx], literal(bv, true)); ctx.mk_th_axiom(get_id(), ~m_bits[v_arg][idx], literal(bv, false)); }