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.
81 lines
2.3 KiB
C++
81 lines
2.3 KiB
C++
#ifndef SPOT_TGBA_SUCCITER_H
|
|
# define SPOT_TGBA_SUCCITER_H
|
|
|
|
#include "state.hh"
|
|
|
|
namespace spot
|
|
{
|
|
|
|
/// \brief Iterate over the successors of a state.
|
|
///
|
|
/// This class provides the basic functionalities required to
|
|
/// iterate over the successors of a state, as well as querying
|
|
/// transition labels. Because transitions are never explicitely
|
|
/// encoded, labels (conditions and promises) can only be queried
|
|
/// while iterating over the successors.
|
|
class tgba_succ_iterator
|
|
{
|
|
public:
|
|
virtual
|
|
~tgba_succ_iterator()
|
|
{
|
|
}
|
|
|
|
/// \name Iteration
|
|
//@{
|
|
|
|
/// \brief Position the iterator on the first successor (if any).
|
|
///
|
|
/// This method can be called several times to make multiple
|
|
/// passes over successors.
|
|
///
|
|
/// \warning One should always call \c done() to
|
|
/// ensure there is a successor, even after \c first(). A
|
|
/// common trap is to assume that there is at least one
|
|
/// successor: this is wrong.
|
|
virtual void first() = 0;
|
|
|
|
/// \brief Jump to the next successor (if any).
|
|
///
|
|
/// \warning Again, one should always call \c done() to ensure
|
|
/// there is a successor.
|
|
virtual void next() = 0;
|
|
|
|
/// \brief Check whether the iteration is finished.
|
|
///
|
|
/// This function should be called after any call to \c first()
|
|
/// or \c next() and before any enquiry about the current state.
|
|
///
|
|
/// The usual way to do this is with a \c for loop.
|
|
/// \code
|
|
/// for (s->first(); !s->done(); s->next())
|
|
/// ...
|
|
/// \endcode
|
|
virtual bool done() = 0;
|
|
|
|
//@}
|
|
|
|
/// \name Inspection
|
|
//@{
|
|
|
|
/// \brief Get the state of the current successor.
|
|
///
|
|
/// Note that the same state may occur at different points
|
|
/// in the iteration. These actually correspond to the same
|
|
/// destination. It just means there were several transitions,
|
|
/// with different conditions or promises, leading to the
|
|
/// same state.
|
|
virtual state* current_state() = 0;
|
|
/// \brief Get the condition on the transition leading to this successor.
|
|
virtual bdd current_condition() = 0;
|
|
/// \brief Get the accepting conditions on the transition leading
|
|
/// to this successor.
|
|
virtual bdd current_accepting_conditions() = 0;
|
|
|
|
//@}
|
|
};
|
|
|
|
}
|
|
|
|
|
|
#endif // SPOT_TGBA_SUCCITER_H
|