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

Deprecate ltl::destroy(f) in favor of f->destroy()

Browse source 
* src/ltlast/formula.cc, src/ltlast/formula.hh (formula::clone):
Transform this static function into a member function.
* src/ltlvisit/destroy.hh (destroy): Document and declare as
deprecated.
* bench/split-product/cutscc.cc, iface/gspn/ltlgspn.cc,
src/eltlparse/eltlparse.yy, src/eltltest/acc.cc,
src/evtgbaalgos/tgba2evtgba.cc, src/evtgbatest/ltl2evtgba.cc,
src/ltlast/automatop.cc, src/ltlast/binop.cc,
src/ltlast/multop.cc, src/ltlast/unop.cc, src/ltlenv/declenv.cc,
src/ltlenv/declenv.hh, src/ltlparse/ltlparse.yy,
src/ltltest/equals.cc, src/ltltest/randltl.cc,
src/ltltest/readltl.cc, src/ltltest/reduc.cc,
src/ltltest/syntimpl.cc, src/ltltest/tostring.cc,
src/ltlvisit/destroy.cc src/ltlvisit/basicreduce.cc,
src/ltlvisit/contain.cc, src/ltlvisit/reduce.cc,
src/ltlvisit/syntimpl.cc, src/tgba/bdddict.cc,
src/tgba/bddprint.cc, src/tgba/taa.cc,
src/tgba/tgbabddconcretefactory.cc, src/tgba/tgbaexplicit.cc,
src/tgba/tgbafromfile.cc, src/tgbaalgos/eltl2tgba_lacim.cc,
src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2tgba_fm.cc,
src/tgbaalgos/ltl2tgba_lacim.cc, src/tgbaalgos/neverclaim.cc,
src/tgbaalgos/randomgraph.cc, src/tgbaparse/tgbaparse.yy,
src/tgbatest/complementation.cc, src/tgbatest/eltl2tgba.cc,
src/tgbatest/ltl2tgba.cc, src/tgbatest/ltlprod.cc,
src/tgbatest/mixprod.cc, src/tgbatest/randtgba.cc,
src/tgbatest/reductgba.cc, wrap/python/cgi/ltl2tgba.in,
wrap/python/tests/ltl2tgba.py, wrap/python/tests/ltlparse.py,
wrap/python/tests/ltlsimple.py: Adjust destroy() usage, and remove
the #include "destroy.hh" when appropriate.
This commit is contained in:
Alexandre Duret-Lutz 2009-11-09 06:54:52 +01:00
parent 48fb19ea44
commit 77df39b4dd
53 changed files with 260 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/ltlvisit/syntimpl.cc
View file

@ -26,7 +26,6 @@
#include "lunabbrev.hh"
#include "simpfg.hh"
#include "nenoform.hh"
#include "ltlvisit/destroy.hh"
namespace spot
{
@ -408,12 +407,12 @@ namespace spot
if (special_case(tmp))
{
result_ = true;
destroy(tmp);
tmp->destroy();
return;
}
if (syntactic_implication(tmp, f))
result_ = true;
destroy(tmp);
tmp->destroy();
return;
}
case unop::G:
@ -425,12 +424,12 @@ namespace spot
if (special_case(tmp))
{
result_ = true;
destroy(tmp);
tmp->destroy();
return;
}
if (syntactic_implication(tmp, f))
result_ = true;
destroy(tmp);
tmp->destroy();
return;
}
case unop::Finish:
@ -581,24 +580,24 @@ namespace spot
l = unop::instance(unop::Not, l);
formula* tmp = unabbreviate_logic(l);
destroy(l);
l->destroy();
l = simplify_f_g(tmp);
destroy(tmp);
tmp->destroy();
tmp = negative_normal_form(l);
destroy(l);
l->destroy();
l = tmp;
tmp = unabbreviate_logic(r);
destroy(r);
r->destroy();
r = simplify_f_g(tmp);
destroy(tmp);
tmp->destroy();
tmp = negative_normal_form(r);
destroy(r);
r->destroy();
r = tmp;
bool result = syntactic_implication(l, r);
destroy(l);
destroy(r);
l->destroy();
r->destroy();
return result;
}
}