* src/ltlvisit/dump.hh (dump): Take a formula* as argument,
not a formula&. This is more homogeneous. * src/ltlvisit/dump.cc (dump): Likewise. * src/ltlvisit/dotty.hh (dotty): Likewise. * src/ltlvisit/dotty.cc (dotty): Likewise. * src/ltlvisit/tostring.hh (to_string): Likewise. * src/ltlvisit/tostring.cc (to_string): Likewise. * src/ltltest/readltl.cc, src/ltltest/equals.cc, src/ltltest/tostring.cc: Adjust usage.
This commit is contained in:
parent
35f77be6c7
commit
7685d3a5b8
10 changed files with 70 additions and 63 deletions
|
|
@ -38,26 +38,23 @@ main(int argc, char** argv)
|
|||
#endif
|
||||
#ifdef LUNABBREV
|
||||
tmp = f1;
|
||||
std::cout << spot::ltl::atomic_prop::instance_count() << std::endl;
|
||||
f1 = spot::ltl::unabbreviate_logic(f1);
|
||||
std::cout << spot::ltl::atomic_prop::instance_count() << std::endl;
|
||||
spot::ltl::destroy(tmp);
|
||||
std::cout << spot::ltl::atomic_prop::instance_count() << std::endl;
|
||||
spot::ltl::dump(*f1, std::cout);
|
||||
spot::ltl::dump(f1, std::cout);
|
||||
std::cout << std::endl;
|
||||
#endif
|
||||
#ifdef TUNABBREV
|
||||
tmp = f1;
|
||||
f1 = spot::ltl::unabbreviate_ltl(f1);
|
||||
spot::ltl::destroy(tmp);
|
||||
spot::ltl::dump(*f1, std::cout);
|
||||
spot::ltl::dump(f1, std::cout);
|
||||
std::cout << std::endl;
|
||||
#endif
|
||||
#ifdef NENOFORM
|
||||
tmp = f1;
|
||||
f1 = spot::ltl::negative_normal_form(f1);
|
||||
spot::ltl::destroy(tmp);
|
||||
spot::ltl::dump(*f1, std::cout);
|
||||
spot::ltl::dump(f1, std::cout);
|
||||
std::cout << std::endl;
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -43,9 +43,9 @@ main(int argc, char** argv)
|
|||
if (f)
|
||||
{
|
||||
#ifdef DOTTY
|
||||
spot::ltl::dotty(*f, std::cout);
|
||||
spot::ltl::dotty(f, std::cout);
|
||||
#else
|
||||
spot::ltl::dump(*f, std::cout);
|
||||
spot::ltl::dump(f, std::cout);
|
||||
std::cout << std::endl;
|
||||
#endif
|
||||
spot::ltl::destroy(f);
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ main(int argc, char **argv)
|
|||
// The string generated from an abstract tree should be parsable
|
||||
// again.
|
||||
|
||||
std::string f1s = spot::ltl::to_string(*f1);
|
||||
std::string f1s = spot::ltl::to_string(f1);
|
||||
std::cout << f1s << std::endl;
|
||||
|
||||
spot::ltl::formula* f2 = spot::ltl::parse(f1s, p1);
|
||||
|
|
@ -41,7 +41,7 @@ main(int argc, char **argv)
|
|||
|
||||
// It should also map to the same string.
|
||||
|
||||
std::string f2s = spot::ltl::to_string(*f2);
|
||||
std::string f2s = spot::ltl::to_string(f2);
|
||||
std::cout << f2s << std::endl;
|
||||
|
||||
if (f2s != f1s)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue