mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

remove reinterpret_cast. Issue #229, issue #24

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-10-04 10:54:19 -07:00
parent 67ddbe4a05
commit 2912c355e2
5 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/interp/iz3foci.cpp
View file

@ -19,7 +19,6 @@
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
#include <assert.h>
#include "iz3hash.h" #include "iz3hash.h"
#include "foci2.h" #include "foci2.h"
@ -197,7 +196,7 @@ public:
std::cerr << "iZ3: unsupported Z3 operator in expression\n "; std::cerr << "iZ3: unsupported Z3 operator in expression\n ";
print_expr(std::cerr,t); print_expr(std::cerr,t);
std::cerr << "\n"; std::cerr << "\n";
assert(0 && "iZ3: unsupported Z3 operator"); SASSERT(0 && "iZ3: unsupported Z3 operator");
} }
} }
return res; return res;
@ -272,7 +271,7 @@ public:
} }
break; break;
default: default:
assert("unknown built-in op"); SASSERT(false && "unknown built-in op");
} }
} }
else if(foci->get_int(i,nval)){ else if(foci->get_int(i,nval)){
@ -280,15 +279,15 @@ public:
} }
else if(foci->get_func(i,f)){ else if(foci->get_func(i,f)){
if(f == select_op){ if(f == select_op){
assert(n == 2); SASSERT(n == 2);
res = make(Select,args[0],args[1]); res = make(Select,args[0],args[1]);
} }
else if(f == store_op){ else if(f == store_op){
assert(n == 3); SASSERT(n == 3);
res = make(Store,args[0],args[1],args[2]); res = make(Store,args[0],args[1],args[2]);
} }
else if(f == mod_op){ else if(f == mod_op){
assert(n == 2); SASSERT(n == 2);
res = make(Mod,args[0],args[1]); res = make(Mod,args[0],args[1]);
} }
else { else {
@ -298,20 +297,20 @@ public:
if(bar.second){ if(bar.second){
std::cout << "unknown function symbol:\n"; std::cout << "unknown function symbol:\n";
foci->show_ast(i); foci->show_ast(i);
assert(0); SASSERT(0);
} }
res = make(func_decl,args); res = make(func_decl,args);
} }
} }
else { else {
std::cerr << "iZ3: unknown FOCI expression kind\n"; std::cerr << "iZ3: unknown FOCI expression kind\n";
assert(0 && "iZ3: unknown FOCI expression kind"); SASSERT(0 && "iZ3: unknown FOCI expression kind");
} }
return res; return res;
} }
int interpolate(const std::vector<ast> &cnsts, std::vector<ast> &itps){ int interpolate(const std::vector<ast> &cnsts, std::vector<ast> &itps){
assert((int)cnsts.size() == frames); SASSERT((int)cnsts.size() == frames);
std::string lia("lia"); std::string lia("lia");
#ifdef _FOCI2 #ifdef _FOCI2
foci = foci2::create(lia); foci = foci2::create(lia);
@ -320,7 +319,7 @@ public:
#endif #endif
if(!foci){ if(!foci){
std::cerr << "iZ3: cannot find foci lia solver.\n"; std::cerr << "iZ3: cannot find foci lia solver.\n";
assert(0); SASSERT(0);
} }
select_op = foci->mk_func("select"); select_op = foci->mk_func("select");
store_op = foci->mk_func("store"); store_op = foci->mk_func("store");
@ -335,7 +334,7 @@ public:
} }
int res = foci->interpolate(foci_cnsts, foci_itps, foci_parents); int res = foci->interpolate(foci_cnsts, foci_itps, foci_parents);
if(res == 0){ if(res == 0){
assert((int)foci_itps.size() == frames-1); SASSERT((int)foci_itps.size() == frames-1);
itps.resize(frames-1); itps.resize(frames-1);
for(int i = 0; i < frames-1; i++){ for(int i = 0; i < frames-1; i++){
// foci->show_ast(foci_itps[i]); // foci->show_ast(foci_itps[i]);

2
src/muz/pdr/pdr_util.cpp
View file

@ -73,7 +73,7 @@ namespace pdr {
} }
std::string pp_cube(unsigned sz, app * const * lits, ast_manager& m) { std::string pp_cube(unsigned sz, app * const * lits, ast_manager& m) {
return pp_cube(sz, reinterpret_cast<expr * const *>(lits), m); return pp_cube(sz, (expr * const *)(lits), m);
} }
std::string pp_cube(unsigned sz, expr * const * lits, ast_manager& m) { std::string pp_cube(unsigned sz, expr * const * lits, ast_manager& m) {

2
src/muz/rel/dl_sparse_table.cpp
View file

@ -293,7 +293,7 @@ namespace datalog {
void key_to_reserve(const key_value & key) const { void key_to_reserve(const key_value & key) const {
m_keys.ensure_reserve(); m_keys.ensure_reserve();
m_keys.write_into_reserve(reinterpret_cast<char *>(key.c_ptr())); m_keys.write_into_reserve((char *)(key.c_ptr()));
} }
offset_vector & get_matching_offset_vector(const key_value & key) { offset_vector & get_matching_offset_vector(const key_value & key) {

2
src/muz/rel/tbv.cpp
View file

@ -43,7 +43,7 @@ void tbv_manager::reset() {
m.reset(); m.reset();
} }
tbv* tbv_manager::allocate() { tbv* tbv_manager::allocate() {
tbv* r = reinterpret_cast<tbv*>(m.allocate()); tbv* r = static_cast<tbv*>(m.allocate());
DEBUG_CODE( DEBUG_CODE(
if (s_debug_alloc) { if (s_debug_alloc) {
TRACE("doc", tout << allocated_tbvs.size() << " " << r << "\n";); TRACE("doc", tout << allocated_tbvs.size() << " " << r << "\n";);

4
src/util/hwf.h
View file

@ -131,11 +131,11 @@ public:
return (x.get_raw() & 0x8000000000000000ull) != 0; return (x.get_raw() & 0x8000000000000000ull) != 0;
} }
const uint64 sig(hwf const & x) const { uint64 sig(hwf const & x) const {
return x.get_raw() & 0x000FFFFFFFFFFFFFull; return x.get_raw() & 0x000FFFFFFFFFFFFFull;
} }
const int exp(hwf const & x) const { int exp(hwf const & x) const {
return ((x.get_raw() & 0x7FF0000000000000ull) >> 52) - 1023; return ((x.get_raw() & 0x7FF0000000000000ull) >> 52) - 1023;
} }