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

Make ast_manager::get_family_id(symbol const &) side-effect free. The version with side-effects is now called ast_manager::mk_family_id

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2012-12-18 17:14:25 -08:00
parent 3ddb1a85f1
commit d92efeb0c5
56 changed files with 127 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/test/bv_simplifier_plugin.cpp
View file

@ -79,7 +79,7 @@ public:
m_arith(m_manager),
m_simp(m_manager, m_bsimp, m_bv_params),
m_bv_util(m_manager),
m_fid(m_manager.get_family_id("bv")) {
m_fid(m_manager.mk_family_id("bv")) {
reg_decl_plugins(m_manager);
}
@ -139,7 +139,7 @@ public:
m_simp.reduce(ar->get_decl(), ar->get_num_args(), ar->get_args(), e);
SASSERT(((a >> 8) | (a << 24)) == u32(e.get()));
params[0] = parameter(m_manager.mk_sort(m_manager.get_family_id("arith"), INT_SORT));
params[0] = parameter(m_manager.mk_sort(m_manager.mk_family_id("arith"), INT_SORT));
ar = m_manager.mk_app(m_fid, OP_BV2INT, 1, params, 1, es);
expr* es2[1] = { ar.get() };
params[0] = parameter(32);

4
src/test/expr_rand.cpp
View file

@ -18,7 +18,7 @@ void tst_expr_arith(unsigned num_files) {
er.seed(rand_seed);
er.initialize_arith(20);
family_id fid = m.get_family_id("arith");
family_id fid = m.mk_family_id("arith");
sort* int_ty = m.mk_sort(fid, INT_SORT, 0, 0);
sort* real_ty = m.mk_sort(fid, REAL_SORT, 0, 0);
@ -56,7 +56,7 @@ void tst_expr_rand(unsigned num_files) {
parameter p2(2);
parameter p8(8);
parameter p32(32);
family_id bvfid = m.get_family_id("bv");
family_id bvfid = m.mk_family_id("bv");
sort* bv1 = m.mk_sort(bvfid, BV_SORT, 1, &p1);
sort* bv2 = m.mk_sort(bvfid, BV_SORT, 1, &p2);
sort* bv8 = m.mk_sort(bvfid, BV_SORT, 1, &p8);

6
src/test/fuzzing/expr_rand.cpp
View file

@ -82,7 +82,7 @@ expr* expr_rand::choose_expr(sort* s) {
void expr_rand::initialize_arith(unsigned num_vars) {
arith_util u(m_manager);
family_id afid = m_manager.get_family_id("arith");
family_id afid = m_manager.mk_family_id("arith");
sort* i_ty = m_manager.mk_sort(afid, INT_SORT, 0, 0);
for(unsigned i = 0; i < num_vars; ++i) {
add_var(i_ty);
@ -106,7 +106,7 @@ void expr_rand::initialize_arith(unsigned num_vars) {
void expr_rand::initialize_bv(unsigned num_vars) {
bv_util u(m_manager);
family_id bfid = m_manager.get_basic_family_id();
family_id bvfid = m_manager.get_family_id("bv");
family_id bvfid = m_manager.mk_family_id("bv");
const unsigned num_sizes = 6;
@ -237,7 +237,7 @@ void expr_rand::initialize_bv(unsigned num_vars) {
}
void expr_rand::initialize_array(unsigned num_vars, sort* dom, sort* rng) {
family_id afid = m_manager.get_family_id("array");
family_id afid = m_manager.mk_family_id("array");
parameter p1(dom), p2(rng);
parameter ps[2] = { p1, p2 };
sort* a = m_manager.mk_sort(afid, ARRAY_SORT, 2, ps);

2
src/test/model_retrieval.cpp
View file

@ -18,7 +18,7 @@ void tst_model_retrieval()
ast_manager m;
reg_decl_plugins(m);
family_id array_fid = m.get_family_id(symbol("array"));
family_id array_fid = m.mk_family_id(symbol("array"));
array_util au(m);
// arr_s and select_fn creation copy-pasted from z3.cpp