twa_succ_iterator: rename accessors
* src/twa/twa.hh, src/ta/ta.hh (current_state, current_acceptance_conditions, current_condition): Rename as... (dst, acc, cond): ... these. * iface/ltsmin/ltsmin.cc, src/kripke/fairkripke.cc, src/kripke/fairkripke.hh, src/kripke/kripke.cc, src/kripke/kripke.hh, src/kripke/kripkeexplicit.cc, src/kripke/kripkeexplicit.hh, src/kripke/kripkeprint.cc, src/ta/taexplicit.cc, src/ta/taexplicit.hh, src/ta/taproduct.cc, src/ta/taproduct.hh, src/ta/tgtaproduct.cc, src/ta/tgtaproduct.hh, src/taalgos/dot.cc, src/taalgos/emptinessta.cc, src/taalgos/minimize.cc, src/taalgos/reachiter.cc, src/taalgos/tgba2ta.cc, src/twa/taatgba.cc, src/twa/taatgba.hh, src/twa/twagraph.hh, src/twa/twaproduct.cc, src/twa/twasafracomplement.cc, src/twaalgos/bfssteps.cc, src/twaalgos/bfssteps.hh, src/twaalgos/compsusp.cc, src/twaalgos/copy.cc, src/twaalgos/emptiness.cc, src/twaalgos/gtec/gtec.cc, src/twaalgos/gv04.cc, src/twaalgos/lbtt.cc, src/twaalgos/ltl2tgba_fm.cc, src/twaalgos/magic.cc, src/twaalgos/minimize.cc, src/twaalgos/ndfs_result.hxx, src/twaalgos/reachiter.cc, src/twaalgos/se05.cc, src/twaalgos/stats.cc, src/twaalgos/stutter.cc, src/twaalgos/tau03.cc, src/twaalgos/tau03opt.cc, wrap/python/tests/interdep.py: Adjust. * NEWS: Mention the renamings.
This commit is contained in:
parent
1b5b9e4a65
commit
f6af2a84cb
46 changed files with 203 additions and 197 deletions
|
|
@ -33,7 +33,7 @@ namespace spot
|
|||
}
|
||||
|
||||
bdd
|
||||
fair_kripke_succ_iterator::current_condition() const
|
||||
fair_kripke_succ_iterator::cond() const
|
||||
{
|
||||
// Do not assert(!done()) here. It is OK to call
|
||||
// this function on a state without successor.
|
||||
|
|
@ -41,7 +41,7 @@ namespace spot
|
|||
}
|
||||
|
||||
acc_cond::mark_t
|
||||
fair_kripke_succ_iterator::current_acceptance_conditions() const
|
||||
fair_kripke_succ_iterator::acc() const
|
||||
{
|
||||
// Do not assert(!done()) here. It is OK to call
|
||||
// this function on a state without successor.
|
||||
|
|
|
|||
|
|
@ -39,23 +39,23 @@ namespace spot
|
|||
/// - fair_kripke_succ_iterator::first()
|
||||
/// - fair_kripke_succ_iterator::next()
|
||||
/// - fair_kripke_succ_iterator::done()
|
||||
/// - fair_kripke_succ_iterator::current_state()
|
||||
/// - fair_kripke_succ_iterator::dst()
|
||||
///
|
||||
/// This class implements fair_kripke_succ_iterator::current_condition(),
|
||||
/// and fair_kripke_succ_iterator::current_acceptance_conditions().
|
||||
/// This class implements fair_kripke_succ_iterator::cond(),
|
||||
/// and fair_kripke_succ_iterator::acc().
|
||||
class SPOT_API fair_kripke_succ_iterator : public twa_succ_iterator
|
||||
{
|
||||
public:
|
||||
/// \brief Constructor
|
||||
///
|
||||
/// The \a cond and \a acc_cond arguments will be those returned
|
||||
/// by fair_kripke_succ_iterator::current_condition(),
|
||||
/// and fair_kripke_succ_iterator::current_acceptance_conditions().
|
||||
/// by fair_kripke_succ_iterator::cond(),
|
||||
/// and fair_kripke_succ_iterator::acc().
|
||||
fair_kripke_succ_iterator(const bdd& cond, acc_cond::mark_t acc_cond);
|
||||
virtual ~fair_kripke_succ_iterator();
|
||||
|
||||
virtual bdd current_condition() const;
|
||||
virtual acc_cond::mark_t current_acceptance_conditions() const;
|
||||
virtual bdd cond() const;
|
||||
virtual acc_cond::mark_t acc() const;
|
||||
protected:
|
||||
bdd cond_;
|
||||
acc_cond::mark_t acc_cond_;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ namespace spot
|
|||
}
|
||||
|
||||
bdd
|
||||
kripke_succ_iterator::current_condition() const
|
||||
kripke_succ_iterator::cond() const
|
||||
{
|
||||
// Do not assert(!done()) here. It is OK to call
|
||||
// this function on a state without successor.
|
||||
|
|
@ -35,7 +35,7 @@ namespace spot
|
|||
}
|
||||
|
||||
acc_cond::mark_t
|
||||
kripke_succ_iterator::current_acceptance_conditions() const
|
||||
kripke_succ_iterator::acc() const
|
||||
{
|
||||
// Do not assert(!done()) here. It is OK to call
|
||||
// this function on a state without successor.
|
||||
|
|
|
|||
|
|
@ -36,17 +36,17 @@ namespace spot
|
|||
/// - kripke_succ_iterator::first()
|
||||
/// - kripke_succ_iterator::next()
|
||||
/// - kripke_succ_iterator::done()
|
||||
/// - kripke_succ_iterator::current_state()
|
||||
/// - kripke_succ_iterator::dst()
|
||||
///
|
||||
/// This class implements kripke_succ_iterator::current_condition(),
|
||||
/// and kripke_succ_iterator::current_acceptance_conditions().
|
||||
/// This class implements kripke_succ_iterator::cond(),
|
||||
/// and kripke_succ_iterator::acc().
|
||||
class SPOT_API kripke_succ_iterator : public twa_succ_iterator
|
||||
{
|
||||
public:
|
||||
/// \brief Constructor
|
||||
///
|
||||
/// The \a cond argument will be the one returned
|
||||
/// by kripke_succ_iterator::current_condition().
|
||||
/// by kripke_succ_iterator::cond().
|
||||
kripke_succ_iterator(const bdd& cond)
|
||||
: cond_(cond)
|
||||
{
|
||||
|
|
@ -59,8 +59,8 @@ namespace spot
|
|||
|
||||
virtual ~kripke_succ_iterator();
|
||||
|
||||
virtual bdd current_condition() const;
|
||||
virtual acc_cond::mark_t current_acceptance_conditions() const;
|
||||
virtual bdd cond() const;
|
||||
virtual acc_cond::mark_t acc() const;
|
||||
protected:
|
||||
bdd cond_;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ namespace spot
|
|||
return it_ == s_->get_succ().end();
|
||||
}
|
||||
|
||||
state_kripke* kripke_explicit_succ_iterator::current_state() const
|
||||
state_kripke* kripke_explicit_succ_iterator::dst() const
|
||||
{
|
||||
assert(!done());
|
||||
return *it_;
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ namespace spot
|
|||
virtual bool next();
|
||||
virtual bool done() const;
|
||||
|
||||
virtual state_kripke* current_state() const;
|
||||
virtual state_kripke* dst() const;
|
||||
|
||||
private:
|
||||
const state_kripke* s_;
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ namespace spot
|
|||
os_ << "\",";
|
||||
for (si->first(); !si->done(); si->next())
|
||||
{
|
||||
state* dest = si->current_state();
|
||||
state* dest = si->dst();
|
||||
os_ << " \"";
|
||||
escape_str(os_, aut_->format_state(dest));
|
||||
os_ << '"';
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue