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

remove references to _DEBUG use Z3DEBUG instead

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-02-29 20:23:20 -08:00
parent 43202572ee
commit 6cf76f2113
4 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/math/automata/symbolic_automata_def.h
View file

@ -75,23 +75,24 @@ typename symbolic_automata<T, M>::automaton_t* symbolic_automata<T, M>::mk_minim
return 0; return 0;
} }
block final_block(fa->final_states()); vector<block> pblocks;
block non_final_block(fa->non_final_states()); unsigned_vector blocks;
vector<block> blocks; pblocks.push_back(block(fa->final_states())); // 0 |-> final states
pblocks.push_back(block(fa->non_final_states()); // 1 |-> non-final states
for (unsigned i = 0; i < fa->num_states(); ++i) { for (unsigned i = 0; i < fa->num_states(); ++i) {
if (fa->is_final_state(i)) { if (fa->is_final_state(i)) {
blocks.push_back(final_block); blocks.push_back(0);
} }
else { else {
blocks.push_back(non_final_block); blocks.push_back(1);
} }
} }
vector<block> W; vector<block> W;
if (final_block.size() > non_final_block.size()) { if (final_block.size() > non_final_block.size()) {
W.push_back(non_final_block); W.push_back(1);
} }
else { else {
W.push_back(final_block); W.push_back(0);
} }
#if 0 #if 0
@ -111,7 +112,7 @@ typename symbolic_automata<T, M>::automaton_t* symbolic_automata<T, M>::mk_minim
fa->get_moves_to(q, mvs); fa->get_moves_to(q, mvs);
for (unsigned i = 0; i < mvs.size(); ++i) { for (unsigned i = 0; i < mvs.size(); ++i) {
unsigned src = mvs[i].src(); unsigned src = mvs[i].src();
if (blocks[src].size() > 1) { if (pblocks[src].size() > 1) {
T* t = mvs[i](); T* t = mvs[i]();
if (gamma.find(src, t1)) { if (gamma.find(src, t1)) {
t = m_ba.mk_or(t, t1); t = m_ba.mk_or(t, t1);
@ -121,10 +122,10 @@ typename symbolic_automata<T, M>::automaton_t* symbolic_automata<T, M>::mk_minim
} }
} }
} }
hashtable<block*> relevant; uint_set relevant;
u_map<T*>::iterator end = gamma.end(); u_map<T*>::iterator end = gamma.end();
for (u_map<T*>::iterator it = gamma.begin(); it != end; ++it) { for (u_map<T*>::iterator it = gamma.begin(); it != end; ++it) {
relevant.insert(blocks[it->m_key]); relevant.insert(it->m_key);
} }
} }

4
src/muz/rel/dl_base.h
View file

@ -435,11 +435,7 @@ namespace datalog {
void destroy() { void destroy() {
SASSERT(this); SASSERT(this);
this->~base_ancestor(); this->~base_ancestor();
#if _DEBUG
memory::deallocate(__FILE__, __LINE__, this);
#else
memory::deallocate(this); memory::deallocate(this);
#endif
} }
public: public:
/** /**

2
src/util/memory_manager.cpp
View file

@ -198,7 +198,7 @@ void memory::display_i_max_usage(std::ostream & os) {
<< "\n"; << "\n";
} }
#if _DEBUG #if Z3DEBUG
void memory::deallocate(char const * file, int line, void * p) { void memory::deallocate(char const * file, int line, void * p) {
deallocate(p); deallocate(p);
TRACE_CODE(if (!g_finalizing) TRACE("memory", tout << "dealloc " << std::hex << p << std::dec << " " << file << ":" << line << "\n";);); TRACE_CODE(if (!g_finalizing) TRACE("memory", tout << "dealloc " << std::hex << p << std::dec << " " << file << ":" << line << "\n";););

2
src/util/memory_manager.h
View file

@ -60,7 +60,7 @@ public:
static void deallocate(void* p); static void deallocate(void* p);
static ALLOC_ATTR void* allocate(size_t s); static ALLOC_ATTR void* allocate(size_t s);
static ALLOC_ATTR void* reallocate(void *p, size_t s); static ALLOC_ATTR void* reallocate(void *p, size_t s);
#if _DEBUG #if Z3DEBUG
static void deallocate(char const* file, int line, void* p); static void deallocate(char const* file, int line, void* p);
static ALLOC_ATTR void* allocate(char const* file, int line, char const* obj, size_t s); static ALLOC_ATTR void* allocate(char const* file, int line, char const* obj, size_t s);
#endif #endif