* 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.
This commit is contained in:
Alexandre Duret-Lutz 2003-07-07 13:43:53 +00:00
parent aaeb297aed
commit c96af6251a
10 changed files with 35 additions and 27 deletions

View file

@ -1,5 +1,13 @@
2003-07-07 Alexandre Duret-Lutz <aduret@src.lip6.fr> 2003-07-07 Alexandre Duret-Lutz <aduret@src.lip6.fr>
* 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. * iface/gspn/gspnlib.h: Fit 80 columns.
[__cplusplus]: Wrap everything under extern "C". [__cplusplus]: Wrap everything under extern "C".

View file

@ -64,14 +64,14 @@ namespace spot
/// in the iteration. These actually correspond to the same /// in the iteration. These actually correspond to the same
/// destination. It just means there were several transitions, /// destination. It just means there were several transitions,
/// with different conditions, leading to the same state. /// 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. /// \brief Get the condition on the transition leading to this successor.
/// ///
/// This is a boolean function of atomic propositions. /// 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 /// \brief Get the accepting conditions on the transition leading
/// to this successor. /// to this successor.
virtual bdd current_accepting_conditions() = 0; virtual bdd current_accepting_conditions() const = 0;
//@} //@}
}; };

View file

@ -129,21 +129,21 @@ namespace spot
} }
state_bdd* state_bdd*
tgba_succ_iterator_concrete::current_state() tgba_succ_iterator_concrete::current_state() const
{ {
assert(!done()); assert(!done());
return new state_bdd(current_state_); return new state_bdd(current_state_);
} }
bdd bdd
tgba_succ_iterator_concrete::current_condition() tgba_succ_iterator_concrete::current_condition() const
{ {
assert(!done()); assert(!done());
return bdd_exist(current_, data_.notvar_set); return bdd_exist(current_, data_.notvar_set);
} }
bdd bdd
tgba_succ_iterator_concrete::current_accepting_conditions() tgba_succ_iterator_concrete::current_accepting_conditions() const
{ {
assert(!done()); assert(!done());
return current_acc_; return current_acc_;

View file

@ -30,9 +30,9 @@ namespace spot
bool done() const; bool done() const;
// inspection // inspection
state_bdd* current_state(); state_bdd* current_state() const;
bdd current_condition(); bdd current_condition() const;
bdd current_accepting_conditions(); bdd current_accepting_conditions() const;
private: private:
const tgba_bdd_core_data& data_; ///< Core data of the automaton. const tgba_bdd_core_data& data_; ///< Core data of the automaton.

View file

@ -35,19 +35,19 @@ namespace spot
} }
state_explicit* state_explicit*
tgba_explicit_succ_iterator::current_state() tgba_explicit_succ_iterator::current_state() const
{ {
return new state_explicit((*i_)->dest); return new state_explicit((*i_)->dest);
} }
bdd bdd
tgba_explicit_succ_iterator::current_condition() tgba_explicit_succ_iterator::current_condition() const
{ {
return (*i_)->condition; return (*i_)->condition;
} }
bdd bdd
tgba_explicit_succ_iterator::current_accepting_conditions() tgba_explicit_succ_iterator::current_accepting_conditions() const
{ {
return (*i_)->accepting_conditions & all_accepting_conditions_; return (*i_)->accepting_conditions & all_accepting_conditions_;
} }

View file

@ -105,9 +105,9 @@ namespace spot
virtual void next(); virtual void next();
virtual bool done() const; virtual bool done() const;
virtual state_explicit* current_state(); virtual state_explicit* current_state() const;
virtual bdd current_condition(); virtual bdd current_condition() const;
virtual bdd current_accepting_conditions(); virtual bdd current_accepting_conditions() const;
private: private:
const tgba_explicit::state* s_; const tgba_explicit::state* s_;

View file

@ -124,19 +124,19 @@ namespace spot
state_bdd_product* state_bdd_product*
tgba_product_succ_iterator::current_state() tgba_product_succ_iterator::current_state() const
{ {
return new state_bdd_product(left_->current_state(), return new state_bdd_product(left_->current_state(),
right_->current_state()); right_->current_state());
} }
bdd bdd
tgba_product_succ_iterator::current_condition() tgba_product_succ_iterator::current_condition() const
{ {
return current_cond_; 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_) return ((left_->current_accepting_conditions() & right_neg_)
| (right_->current_accepting_conditions() & left_neg_)); | (right_->current_accepting_conditions() & left_neg_));

View file

@ -67,9 +67,9 @@ namespace spot
bool done() const; bool done() const;
// inspection // inspection
state_bdd_product* current_state(); state_bdd_product* current_state() const;
bdd current_condition(); bdd current_condition() const;
bdd current_accepting_conditions(); bdd current_accepting_conditions() const;
private: private:
//@{ //@{

View file

@ -39,7 +39,7 @@ namespace spot
} }
state* state*
tgba_translate_proxy_succ_iterator::current_state() tgba_translate_proxy_succ_iterator::current_state() const
{ {
state* s = iter_->current_state(); state* s = iter_->current_state();
s->translate(rewrite_); s->translate(rewrite_);
@ -47,13 +47,13 @@ namespace spot
} }
bdd bdd
tgba_translate_proxy_succ_iterator::current_condition() tgba_translate_proxy_succ_iterator::current_condition() const
{ {
return bdd_replace(iter_->current_condition(), rewrite_); return bdd_replace(iter_->current_condition(), rewrite_);
} }
bdd 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_); return bdd_replace(iter_->current_accepting_conditions(), rewrite_);
} }

View file

@ -20,9 +20,9 @@ namespace spot
bool done() const; bool done() const;
// inspection // inspection
state* current_state(); state* current_state() const;
bdd current_condition(); bdd current_condition() const;
bdd current_accepting_conditions(); bdd current_accepting_conditions() const;
protected: protected:
tgba_succ_iterator* iter_; tgba_succ_iterator* iter_;
bddPair* rewrite_; bddPair* rewrite_;