mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-29 17:38:45 +00:00
Code Activity

More renaming mk_value -> mk_numeral

Browse source 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
This commit is contained in:
Christoph M. Wintersteiger 2015-01-08 14:23:13 +00:00
parent c0bc2518b0
commit 33dc6340e1
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ast/ast_smt2_pp.cpp
View file

@ -228,7 +228,7 @@ format * smt2_pp_environment::pp_float_literal(app * t, bool use_bv_lits, bool u
ast_manager & m = get_manager(); ast_manager & m = get_manager();
format * body = 0; format * body = 0;
string_buffer<> buf; string_buffer<> buf;
VERIFY(get_futil().is_value(t, v)); VERIFY(get_futil().is_numeral(t, v));
if (fm.is_nan(v)) { if (fm.is_nan(v)) {
buf << "(_ NaN " << v.get().get_ebits() << " " << v.get().get_sbits() << ")"; buf << "(_ NaN " << v.get().get_ebits() << " " << v.get().get_sbits() << ")";
return mk_string(m, buf.c_str()); return mk_string(m, buf.c_str());
@ -575,7 +575,7 @@ class smt2_printer {
else if (m_env.get_bvutil().is_numeral(c)) { else if (m_env.get_bvutil().is_numeral(c)) {
f = m_env.pp_bv_literal(c, m_pp_bv_lits, m_pp_bv_neg); f = m_env.pp_bv_literal(c, m_pp_bv_lits, m_pp_bv_neg);
} }
else if (m_env.get_futil().is_value(c)) { else if (m_env.get_futil().is_numeral(c)) {
f = m_env.pp_float_literal(c, m_pp_bv_lits, m_pp_float_real_lits); f = m_env.pp_float_literal(c, m_pp_bv_lits, m_pp_float_real_lits);
} }
else if (m_env.get_dlutil().is_numeral(c)) { else if (m_env.get_dlutil().is_numeral(c)) {

4
src/ast/fpa/fpa2bv_converter.h
View file

@ -50,7 +50,7 @@ protected:
arith_util m_arith_util; arith_util m_arith_util;
mpf_manager & m_mpf_manager; mpf_manager & m_mpf_manager;
unsynch_mpz_manager & m_mpz_manager; unsynch_mpz_manager & m_mpz_manager;
fpa_decl_plugin * m_plugin; fpa_decl_plugin * m_plugin;
bool m_hi_fp_unspecified; bool m_hi_fp_unspecified;
obj_map<func_decl, expr*> m_const2bv; obj_map<func_decl, expr*> m_const2bv;
@ -86,7 +86,7 @@ public:
void mk_ite(expr * c, expr * t, expr * f, expr_ref & result); void mk_ite(expr * c, expr * t, expr * f, expr_ref & result);
void mk_rounding_mode(func_decl * f, expr_ref & result); void mk_rounding_mode(func_decl * f, expr_ref & result);
void mk_value(func_decl * f, unsigned num, expr * const * args, expr_ref & result); void mk_numeral(func_decl * f, unsigned num, expr * const * args, expr_ref & result);
virtual void mk_const(func_decl * f, expr_ref & result); virtual void mk_const(func_decl * f, expr_ref & result);
virtual void mk_rm_const(func_decl * f, expr_ref & result); virtual void mk_rm_const(func_decl * f, expr_ref & result);
void mk_uninterpreted_function(func_decl * f, unsigned num, expr * const * args, expr_ref & result); void mk_uninterpreted_function(func_decl * f, unsigned num, expr * const * args, expr_ref & result);

2
src/ast/fpa/fpa2bv_rewriter.h
View file

@ -120,7 +120,7 @@ struct fpa2bv_rewriter_cfg : public default_rewriter_cfg {
case OP_FPA_RM_TOWARD_NEGATIVE: case OP_FPA_RM_TOWARD_NEGATIVE:
case OP_FPA_RM_TOWARD_POSITIVE: case OP_FPA_RM_TOWARD_POSITIVE:
case OP_FPA_RM_TOWARD_ZERO: m_conv.mk_rounding_mode(f, result); return BR_DONE; case OP_FPA_RM_TOWARD_ZERO: m_conv.mk_rounding_mode(f, result); return BR_DONE;
case OP_FPA_VALUE: m_conv.mk_value(f, num, args, result); return BR_DONE; case OP_FPA_NUM: m_conv.mk_numeral(f, num, args, result); return BR_DONE;
case OP_FPA_PLUS_INF: m_conv.mk_pinf(f, result); return BR_DONE; case OP_FPA_PLUS_INF: m_conv.mk_pinf(f, result); return BR_DONE;
case OP_FPA_MINUS_INF: m_conv.mk_ninf(f, result); return BR_DONE; case OP_FPA_MINUS_INF: m_conv.mk_ninf(f, result); return BR_DONE;
case OP_FPA_PLUS_ZERO: m_conv.mk_pzero(f, result); return BR_DONE; case OP_FPA_PLUS_ZERO: m_conv.mk_pzero(f, result); return BR_DONE;

14
src/ast/fpa_decl_plugin.cpp
View file

@ -68,18 +68,18 @@ void fpa_decl_plugin::recycled_id(unsigned id) {
m_fm.del(m_values[id]); m_fm.del(m_values[id]);
} }
func_decl * fpa_decl_plugin::mk_value_decl(mpf const & v) { func_decl * fpa_decl_plugin::mk_numeral_decl(mpf const & v) {
parameter p(mk_id(v), true); parameter p(mk_id(v), true);
SASSERT(p.is_external()); SASSERT(p.is_external());
sort * s = mk_float_sort(v.get_ebits(), v.get_sbits()); sort * s = mk_float_sort(v.get_ebits(), v.get_sbits());
return m_manager->mk_const_decl(symbol("fpa"), s, func_decl_info(m_family_id, OP_FPA_NUM, 1, &p)); return m_manager->mk_const_decl(symbol("fpa"), s, func_decl_info(m_family_id, OP_FPA_NUM, 1, &p));
} }
app * fpa_decl_plugin::mk_value(mpf const & v) { app * fpa_decl_plugin::mk_numeral(mpf const & v) {
return m_manager->mk_const(mk_value_decl(v)); return m_manager->mk_const(mk_numeral_decl(v));
} }
bool fpa_decl_plugin::is_value(expr * n, mpf & val) { bool fpa_decl_plugin::is_numeral(expr * n, mpf & val) {
if (is_app_of(n, m_family_id, OP_FPA_NUM)) { if (is_app_of(n, m_family_id, OP_FPA_NUM)) {
m_fm.set(val, m_values[to_app(n)->get_decl()->get_parameter(0).get_ext_id()]); m_fm.set(val, m_values[to_app(n)->get_decl()->get_parameter(0).get_ext_id()]);
return true; return true;
@ -117,7 +117,7 @@ bool fpa_decl_plugin::is_value(expr * n, mpf & val) {
return false; return false;
} }
bool fpa_decl_plugin::is_rm_value(expr * n, mpf_rounding_mode & val) { bool fpa_decl_plugin::is_rm_numeral(expr * n, mpf_rounding_mode & val) {
if (is_app_of(n, m_family_id, OP_FPA_RM_NEAREST_TIES_TO_AWAY)) { if (is_app_of(n, m_family_id, OP_FPA_RM_NEAREST_TIES_TO_AWAY)) {
val = MPF_ROUND_NEAREST_TAWAY; val = MPF_ROUND_NEAREST_TAWAY;
return true; return true;
@ -260,7 +260,7 @@ func_decl * fpa_decl_plugin::mk_float_const_decl(decl_kind k, unsigned num_param
case OP_FPA_PLUS_ZERO: m_fm.mk_pzero(ebits, sbits, val); break; case OP_FPA_PLUS_ZERO: m_fm.mk_pzero(ebits, sbits, val); break;
} }
return mk_value_decl(val); return mk_numeral_decl(val);
} }
func_decl * fpa_decl_plugin::mk_bin_rel_decl(decl_kind k, unsigned num_parameters, parameter const * parameters, func_decl * fpa_decl_plugin::mk_bin_rel_decl(decl_kind k, unsigned num_parameters, parameter const * parameters,
@ -846,7 +846,7 @@ expr * fpa_decl_plugin::get_some_value(sort * s) {
SASSERT(s->is_sort_of(m_family_id, FLOATING_POINT_SORT)); SASSERT(s->is_sort_of(m_family_id, FLOATING_POINT_SORT));
mpf tmp; mpf tmp;
m_fm.mk_nan(s->get_parameter(0).get_int(), s->get_parameter(1).get_int(), tmp); m_fm.mk_nan(s->get_parameter(0).get_int(), s->get_parameter(1).get_int(), tmp);
expr * res = this->mk_value(tmp); expr * res = this->mk_numeral(tmp);
m_fm.del(tmp); m_fm.del(tmp);
return res; return res;
} }