alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Introduce a destroy() method on states, and use it instead of delete.

Browse source 
Right now, destroy() just executes "delete this".  But in a later
version, we will rewrite tgba_explicit so that it does not
allocate new states (and the destroy() method for explicit state
will do nothing).

* src/tgba/state.hh (state::destroy): New method, to replace
state::~state() in the future.
(shared_state_deleter): New function.
* src/evtgba/product.cc, src/evtgbaalgos/reachiter.cc,
src/evtgbaalgos/save.cc, src/evtgbaalgos/tgba2evtgba.cc,
src/tgba/tgba.cc, src/tgba/tgbaproduct.cc, src/tgba/tgbareduc.cc,
src/tgba/tgbasafracomplement.cc, src/tgba/tgbasgba.cc,
src/tgba/tgbatba.cc, src/tgba/tgbaunion.cc, src/tgba/wdbacomp.cc,
src/tgbaalgos/cutscc.cc, src/tgbaalgos/emptiness.cc,
src/tgbaalgos/gtec/ce.cc, src/tgbaalgos/gtec/explscc.cc,
src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gtec/nsheap.cc,
src/tgbaalgos/gv04.cc, src/tgbaalgos/magic.cc,
src/tgbaalgos/minimize.cc, src/tgbaalgos/ndfs_result.hxx,
src/tgbaalgos/neverclaim.cc, src/tgbaalgos/powerset.hh,
src/tgbaalgos/reachiter.cc, src/tgbaalgos/reducerun.cc,
src/tgbaalgos/reductgba_sim.cc,
src/tgbaalgos/reductgba_sim_del.cc, src/tgbaalgos/replayrun.cc,
src/tgbaalgos/safety.cc, src/tgbaalgos/save.cc,
src/tgbaalgos/scc.cc, src/tgbaalgos/se05.cc,
src/tgbaalgos/tau03.cc, src/tgbaalgos/tau03opt.cc: Adjust to call
"s->destroy()" instead of "delete s".
* src/saba/sabacomplementtgba.cc, src/tgba/tgbakvcomplement.cc:
Pass shared_state_deleter to the shared_ptr constructor, so that
it calls destroy() instead of delete.
This commit is contained in:
Alexandre Duret-Lutz 2011-01-25 18:56:42 +01:00
parent 60930d7a12
commit 574a228583
39 changed files with 259 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/tgbaalgos/minimize.cc
View file

@ -105,7 +105,7 @@ namespace spot
seen->insert(dst);
}
else
delete dst;
dst->destroy();
}
delete sit;
}
@ -151,7 +151,7 @@ namespace spot
{
const state* dst = succit->current_state();
unsigned dst_num = state_num[dst];
delete dst;
dst->destroy();
trs* t = res->create_transition(src_num, dst_num);
res->add_conditions(t, succit->current_condition());
if (accepting)
@ -163,7 +163,7 @@ namespace spot
res->merge_transitions();
const state* init_state = a->get_init_state();
unsigned init_num = state_num[init_state];
delete init_state;
init_state->destroy();
res->set_init_state(init_num);
return res;
}
@ -190,7 +190,7 @@ namespace spot
{
hash_set::const_iterator old = i;
++i;
delete *old;
(*old)->destroy();
}
}
@ -205,7 +205,7 @@ namespace spot
}
else
{
delete s;
s->destroy();
s = *i;
}
// Ignore states outside SCC #n.
@ -250,11 +250,11 @@ namespace spot
for (n = 1, i = loop.begin(); n < loop_size; ++n, ++i)
{
loop_a.create_transition(n - 1, n)->condition = i->label;
delete i->s;
i->s->destroy();
}
assert(i != loop.end());
loop_a.create_transition(n - 1, 0)->condition = i->label;
delete i->s;
i->s->destroy();
assert(++i == loop.end());
const state* loop_a_init = loop_a.get_init_state();
@ -284,7 +284,7 @@ namespace spot
delete p;
}
delete loop_a_init;
loop_a_init->destroy();
return accepting;
}
@ -383,7 +383,7 @@ namespace spot
{
const state* dst = si->current_state();
unsigned dst_set = state_set_map[dst];
delete dst;
dst->destroy();
f |= (bdd_ithvar(dst_set) & si->current_condition());
}
delete si;
@ -480,7 +480,7 @@ namespace spot
for (hit = state_set_map.begin(); hit != state_set_map.end();)
{
hash_map::iterator old = hit++;
delete old->first;
old->first->destroy();
}
std::list<hash_set*>::iterator it;
for (it = done.begin(); it != done.end(); ++it)