Commit c96af625 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

* 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.
parent aaeb297a
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.
[__cplusplus]: Wrap everything under extern "C".
......
......@@ -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;
//@}
};
......
......@@ -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_;
......
......@@ -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.
......
......@@ -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_;
}
......
......@@ -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_;
......
......@@ -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_));
......
......@@ -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:
//@{
......
......@@ -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_);
}
......
......@@ -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_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment