25e6cca4b4
of these accepting set so that they are really usable. Provide a all_accepting_conditions() method for use in the emptyness check, and a neg_accepting_conditions() for products. Predeclare TGBA accepting conditions is the i/o. * src/tgba/bddprint.cc (want_prom): Rename as ... (want_prom): ... this. (print_handler): Adjust to display Acc[]. (print_acc_handler, bdd_print_acc): New functions. * src/tgba/bddprint.hh (print_acc_handler, bdd_print_acc): New functions. * src/tgba/succiter.hh (current_promise): Rename as ... (current_accepting_conditions): ... this. * src/tgba/succiterconcrete.cc (current_state): Rename next to now. (current_promise): Rename as ... (current_accepting_conditions): ... this, and compute the accepting conditions. * src/tgba/dictunion.cc, src/tgba/ltl2tgba.cc, src/tgba/succiterconcrete.hh, src/tgba/tgbabddconcretefactory.cc, src/tgba/tgbabddcoredata.cc, src/tgba/tgbabddcoredata.hh, src/tgba/tgbabdddict.hh, src/tgba/tgbabdddict.cc, src/tgba/tgbabddtranslatefactory.cc, src/tgbaalgos/dotty.cc: Adjust to new names. * src/tgba/tgba.hh (all_accepting_conditions, neg_accepting_conditions): New functions. * src/tgba/tgbabddconcretefactory.cc: Adjust to new names, and record accepting conditions instead of promises. * src/tgba/tgbabddcoredata.hh (accepting_conditions, all_accepting_conditions, negacc_set): New variables. (notnow_set, notprom_set, declare_promise): Rename as ... (notnext_set, notacc_set, declare_accepting_condition): ... these. * src/tgba/tgbaexplicit.hh (tgba_explicit_succ_iterator::current_promise): Rename as ... (tgba_explicit_succ_iterator::current_accepting_conditions): ... this. (tgba_explicit::add_promise): Rename as ... (tgba_explicit::add_accepting_condition): ... this. (tgba_explicit::declare_accepting_condition, tgba_explicit::has_accepting_condition): New variables. (tgba_explicit::get_promise): Rename as ... (tgba_explicit::get_accepting_condition): ... this. (tgba_explicit::all_accepting_conditions, tgba_explicit::neg_accepting_conditions): Implement them. (all_accepting_conditions, neg_accepting_conditions, all_accepting_conditions): New variables. (tgba_explicit_succ_iterator): Embed all_accepting_conditions_. * src/tgba/tgbaexplicit.cc: Likewise. * src/tgba/tgbaproduct.hh (tgba_product_succ_uterator): Embed left_neg_ and right_neg_. (tgba_product::all_accepting_conditions, tgba_product::neg_accepting_conditions): Implement them. * src/tgba/tgbatranslateproxy.hh: (tgba_translate_proxy::all_accepting_conditions, tgba_translate_proxy::neg_accepting_conditions): Implement them. * src/tgba/tgbatranslateproxy.cc: Likewise. * src/tgbaalgos/save.cc (save_rec): Call bdd_print (tgba_save_reachable): Output the `acc =' line. * src/tgbaparse/tgbaparse.yy: Support the for accepting conditions definitions using an "acc =" line at the start. Later, use has_accepting_condition while parsing accepting conditions to ensure they were declared. Disallow !cond in accepting conditions. * src/tgbaparse/tgbascan.ll (ACC_DEF): New token. * src/tgbatest/explicit.cc (main): Declare accepting conditions. * src/tgbatest/ltl2tgba.cc (main): Add support for the -a, -A, and -R new options. * src/tgbatest/tgbaread.cc (main): Really exit on parse error. * src/tgbatest/explicit.test, src/tgbatest/explprod.test, src/tgbatest/mixprod.test, src/tgbatest/readsave.test, src/tgbatest/tgbaread.test, src/tgbatest/tripprod.test: Reflect recent changes.
124 lines
2.8 KiB
C++
124 lines
2.8 KiB
C++
#include <iostream>
|
|
#include <cassert>
|
|
#include "ltlvisit/destroy.hh"
|
|
#include "ltlast/allnodes.hh"
|
|
#include "ltlparse/public.hh"
|
|
#include "tgba/ltl2tgba.hh"
|
|
#include "tgba/bddprint.hh"
|
|
#include "tgba/tgbabddtranslatefactory.hh"
|
|
#include "tgbaalgos/dotty.hh"
|
|
|
|
void
|
|
syntax(char* prog)
|
|
{
|
|
std::cerr << "Usage: "<< prog << " [-d][-o][-r] formula" << std::endl
|
|
<< std::endl
|
|
<< " -a display the accepting_conditions BDD, not the reachability graph"
|
|
<< " -A same as -a, but as a set" << std::endl
|
|
<< " -d turn on traces during parsing" << std::endl
|
|
<< " -o re-order BDD variables in the automata" << std::endl
|
|
<< std::endl
|
|
<< " -r display the relation BDD, not the reachability graph"
|
|
<< std::endl
|
|
<< " -R same as -r, but as a set" << std::endl;
|
|
exit(2);
|
|
}
|
|
|
|
int
|
|
main(int argc, char** argv)
|
|
{
|
|
int exit_code = 0;
|
|
|
|
bool debug_opt = false;
|
|
bool defrag_opt = false;
|
|
int output = 0;
|
|
int formula_index = 0;
|
|
|
|
for (;;)
|
|
{
|
|
if (argc < formula_index + 2)
|
|
syntax(argv[0]);
|
|
|
|
++formula_index;
|
|
|
|
if (!strcmp(argv[formula_index], "-a"))
|
|
{
|
|
output = 2;
|
|
}
|
|
else if (!strcmp(argv[formula_index], "-A"))
|
|
{
|
|
output = 4;
|
|
}
|
|
else if (!strcmp(argv[formula_index], "-d"))
|
|
{
|
|
debug_opt = true;
|
|
}
|
|
else if (!strcmp(argv[formula_index], "-o"))
|
|
{
|
|
defrag_opt = true;
|
|
}
|
|
else if (!strcmp(argv[formula_index], "-r"))
|
|
{
|
|
output = 1;
|
|
}
|
|
else if (!strcmp(argv[formula_index], "-R"))
|
|
{
|
|
output = 3;
|
|
}
|
|
else
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
spot::ltl::environment& env(spot::ltl::default_environment::instance());
|
|
spot::ltl::parse_error_list pel;
|
|
spot::ltl::formula* f = spot::ltl::parse(argv[formula_index],
|
|
pel, env, debug_opt);
|
|
|
|
exit_code =
|
|
spot::ltl::format_parse_errors(std::cerr, argv[formula_index], pel);
|
|
|
|
if (f)
|
|
{
|
|
spot::tgba_bdd_concrete a = spot::ltl_to_tgba(f);
|
|
spot::ltl::destroy(f);
|
|
if (defrag_opt)
|
|
a = spot::defrag(a);
|
|
switch (output)
|
|
{
|
|
case 0:
|
|
spot::dotty_reachable(std::cout, a);
|
|
break;
|
|
case 1:
|
|
spot::bdd_print_dot(std::cout, a.get_dict(),
|
|
a.get_core_data().relation);
|
|
break;
|
|
case 2:
|
|
spot::bdd_print_dot(std::cout, a.get_dict(),
|
|
a.get_core_data().accepting_conditions);
|
|
break;
|
|
case 3:
|
|
spot::bdd_print_set(std::cout, a.get_dict(),
|
|
a.get_core_data().relation);
|
|
break;
|
|
case 4:
|
|
spot::bdd_print_set(std::cout, a.get_dict(),
|
|
a.get_core_data().accepting_conditions);
|
|
break;
|
|
default:
|
|
assert(!"unknown output option");
|
|
}
|
|
}
|
|
else
|
|
{
|
|
exit_code = 1;
|
|
}
|
|
|
|
assert(spot::ltl::atomic_prop::instance_count() == 0);
|
|
assert(spot::ltl::unop::instance_count() == 0);
|
|
assert(spot::ltl::binop::instance_count() == 0);
|
|
assert(spot::ltl::multop::instance_count() == 0);
|
|
return exit_code;
|
|
}
|