From c96af6251a31a6fc51cb6fd2ec5570363f05ae3d Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 7 Jul 2003 13:43:53 +0000 Subject: [PATCH] * src/tgba/succiter.hh (current_state, current_conditions current_accepting_conditions): Mark as const. * src/tgba/succiterconcrete.cc, src/tgba/succiterconcrete.hh, src/tgba/tgbaexplicit.cc, src/tgba/tgbaexplicit.hh, src/tgba/tgbaproduct.cc, src/tgba/tgbaproduct.hh, src/tgba/tgbatranslateproxy.cc, src/tgba/tgbatranslateproxy.hh: Likewise. --- ChangeLog | 8 ++++++++ src/tgba/succiter.hh | 6 +++--- src/tgba/succiterconcrete.cc | 6 +++--- src/tgba/succiterconcrete.hh | 6 +++--- src/tgba/tgbaexplicit.cc | 6 +++--- src/tgba/tgbaexplicit.hh | 6 +++--- src/tgba/tgbaproduct.cc | 6 +++--- src/tgba/tgbaproduct.hh | 6 +++--- src/tgba/tgbatranslateproxy.cc | 6 +++--- src/tgba/tgbatranslateproxy.hh | 6 +++--- 10 files changed, 35 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a70dd684..93699a3c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2003-07-07 Alexandre Duret-Lutz + * src/tgba/succiter.hh (current_state, current_conditions + current_accepting_conditions): Mark as const. + * src/tgba/succiterconcrete.cc, src/tgba/succiterconcrete.hh, + src/tgba/tgbaexplicit.cc, src/tgba/tgbaexplicit.hh, + src/tgba/tgbaproduct.cc, src/tgba/tgbaproduct.hh, + src/tgba/tgbatranslateproxy.cc, src/tgba/tgbatranslateproxy.hh: + Likewise. + * iface/gspn/gspnlib.h: Fit 80 columns. [__cplusplus]: Wrap everything under extern "C". diff --git a/src/tgba/succiter.hh b/src/tgba/succiter.hh index 7c619f778..6f43ad68b 100644 --- a/src/tgba/succiter.hh +++ b/src/tgba/succiter.hh @@ -64,14 +64,14 @@ namespace spot /// in the iteration. These actually correspond to the same /// destination. It just means there were several transitions, /// with different conditions, leading to the same state. - virtual state* current_state() = 0; + virtual state* current_state() const = 0; /// \brief Get the condition on the transition leading to this successor. /// /// This is a boolean function of atomic propositions. - virtual bdd current_condition() = 0; + virtual bdd current_condition() const = 0; /// \brief Get the accepting conditions on the transition leading /// to this successor. - virtual bdd current_accepting_conditions() = 0; + virtual bdd current_accepting_conditions() const = 0; //@} }; diff --git a/src/tgba/succiterconcrete.cc b/src/tgba/succiterconcrete.cc index 432fcc1c8..d526dd5ff 100644 --- a/src/tgba/succiterconcrete.cc +++ b/src/tgba/succiterconcrete.cc @@ -129,21 +129,21 @@ namespace spot } state_bdd* - tgba_succ_iterator_concrete::current_state() + tgba_succ_iterator_concrete::current_state() const { assert(!done()); return new state_bdd(current_state_); } bdd - tgba_succ_iterator_concrete::current_condition() + tgba_succ_iterator_concrete::current_condition() const { assert(!done()); return bdd_exist(current_, data_.notvar_set); } bdd - tgba_succ_iterator_concrete::current_accepting_conditions() + tgba_succ_iterator_concrete::current_accepting_conditions() const { assert(!done()); return current_acc_; diff --git a/src/tgba/succiterconcrete.hh b/src/tgba/succiterconcrete.hh index 165996f8e..904765021 100644 --- a/src/tgba/succiterconcrete.hh +++ b/src/tgba/succiterconcrete.hh @@ -30,9 +30,9 @@ namespace spot bool done() const; // inspection - state_bdd* current_state(); - bdd current_condition(); - bdd current_accepting_conditions(); + state_bdd* current_state() const; + bdd current_condition() const; + bdd current_accepting_conditions() const; private: const tgba_bdd_core_data& data_; ///< Core data of the automaton. diff --git a/src/tgba/tgbaexplicit.cc b/src/tgba/tgbaexplicit.cc index 3a7a8175b..9c03f6573 100644 --- a/src/tgba/tgbaexplicit.cc +++ b/src/tgba/tgbaexplicit.cc @@ -35,19 +35,19 @@ namespace spot } state_explicit* - tgba_explicit_succ_iterator::current_state() + tgba_explicit_succ_iterator::current_state() const { return new state_explicit((*i_)->dest); } bdd - tgba_explicit_succ_iterator::current_condition() + tgba_explicit_succ_iterator::current_condition() const { return (*i_)->condition; } bdd - tgba_explicit_succ_iterator::current_accepting_conditions() + tgba_explicit_succ_iterator::current_accepting_conditions() const { return (*i_)->accepting_conditions & all_accepting_conditions_; } diff --git a/src/tgba/tgbaexplicit.hh b/src/tgba/tgbaexplicit.hh index 672fd89bc..87cb826e6 100644 --- a/src/tgba/tgbaexplicit.hh +++ b/src/tgba/tgbaexplicit.hh @@ -105,9 +105,9 @@ namespace spot virtual void next(); virtual bool done() const; - virtual state_explicit* current_state(); - virtual bdd current_condition(); - virtual bdd current_accepting_conditions(); + virtual state_explicit* current_state() const; + virtual bdd current_condition() const; + virtual bdd current_accepting_conditions() const; private: const tgba_explicit::state* s_; diff --git a/src/tgba/tgbaproduct.cc b/src/tgba/tgbaproduct.cc index b471c6bfb..abc9db54e 100644 --- a/src/tgba/tgbaproduct.cc +++ b/src/tgba/tgbaproduct.cc @@ -124,19 +124,19 @@ namespace spot state_bdd_product* - tgba_product_succ_iterator::current_state() + tgba_product_succ_iterator::current_state() const { return new state_bdd_product(left_->current_state(), right_->current_state()); } bdd - tgba_product_succ_iterator::current_condition() + tgba_product_succ_iterator::current_condition() const { return current_cond_; } - bdd tgba_product_succ_iterator::current_accepting_conditions() + bdd tgba_product_succ_iterator::current_accepting_conditions() const { return ((left_->current_accepting_conditions() & right_neg_) | (right_->current_accepting_conditions() & left_neg_)); diff --git a/src/tgba/tgbaproduct.hh b/src/tgba/tgbaproduct.hh index fae6c5d71..415adbf2f 100644 --- a/src/tgba/tgbaproduct.hh +++ b/src/tgba/tgbaproduct.hh @@ -67,9 +67,9 @@ namespace spot bool done() const; // inspection - state_bdd_product* current_state(); - bdd current_condition(); - bdd current_accepting_conditions(); + state_bdd_product* current_state() const; + bdd current_condition() const; + bdd current_accepting_conditions() const; private: //@{ diff --git a/src/tgba/tgbatranslateproxy.cc b/src/tgba/tgbatranslateproxy.cc index df07f2943..2944801dc 100644 --- a/src/tgba/tgbatranslateproxy.cc +++ b/src/tgba/tgbatranslateproxy.cc @@ -39,7 +39,7 @@ namespace spot } state* - tgba_translate_proxy_succ_iterator::current_state() + tgba_translate_proxy_succ_iterator::current_state() const { state* s = iter_->current_state(); s->translate(rewrite_); @@ -47,13 +47,13 @@ namespace spot } bdd - tgba_translate_proxy_succ_iterator::current_condition() + tgba_translate_proxy_succ_iterator::current_condition() const { return bdd_replace(iter_->current_condition(), rewrite_); } bdd - tgba_translate_proxy_succ_iterator::current_accepting_conditions() + tgba_translate_proxy_succ_iterator::current_accepting_conditions() const { return bdd_replace(iter_->current_accepting_conditions(), rewrite_); } diff --git a/src/tgba/tgbatranslateproxy.hh b/src/tgba/tgbatranslateproxy.hh index 2943444c0..3f2cb24ea 100644 --- a/src/tgba/tgbatranslateproxy.hh +++ b/src/tgba/tgbatranslateproxy.hh @@ -20,9 +20,9 @@ namespace spot bool done() const; // inspection - state* current_state(); - bdd current_condition(); - bdd current_accepting_conditions(); + state* current_state() const; + bdd current_condition() const; + bdd current_accepting_conditions() const; protected: tgba_succ_iterator* iter_; bddPair* rewrite_;