alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Minor fixes to compile with GCC 3.3

Browse source 
* src/ltlast/automatop.cc, src/ltlast/automatop.hh: Rename nfa as
get_nfa to avoid a name clash with the `nfa' class.
* src/ltlvisit/clone.cc, src/ltlvisit/nenoform.cc,
src/ltlvisit/tostring.cc, src/tgbaalgos/eltl2tgba_lacim.cc: Use
get_nfa instead of nfa.
* src/tgba/tgbasafracomplement.cc: Don't use a
const_reverse_iterator.
This commit is contained in:
Damien Lefortier 2010-01-20 17:09:06 +01:00
parent dcf7eed11f
commit 0d6fd3225a
8 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,15 @@
2010-01-20 Damien Lefortier <dam@lrde.epita.fr>
Minor fixes to compile with GCC 3.3
* src/ltlast/automatop.cc, src/ltlast/automatop.hh: Rename nfa as
get_nfa to avoid a name clash with the `nfa' class.
* src/ltlvisit/clone.cc, src/ltlvisit/nenoform.cc,
src/ltlvisit/tostring.cc, src/tgbaalgos/eltl2tgba_lacim.cc: Use
get_nfa instead of nfa.
* src/tgba/tgbasafracomplement.cc: Don't use a
const_reverse_iterator.
2010-01-20 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Remove some non-determinism in random_graph()
@ -8,7 +20,7 @@
some non-determinism because of the memory layout. It was almost
impossible to reproduce bugs found by tests based on randtgba.
2010-01-18 Damien Lefortier <dam@lrde.epita.fr>
2010-01-19 Damien Lefortier <dam@lrde.epita.fr>
* src/tgbaalgos/ltl2taa.cc: Fix the previous patch.

6
src/ltlast/automatop.cc
View file

@ -35,7 +35,7 @@ namespace spot
automatop::~automatop()
{
// Get this instance out of the instance map.
triplet p(std::make_pair(nfa(), negated_), children_);
triplet p(std::make_pair(get_nfa(), negated_), children_);
map::iterator i = instances.find(p);
assert (i != instances.end());
instances.erase(i);
@ -51,7 +51,7 @@ namespace spot
automatop::dump() const
{
std::string r = is_negated() ? "!" : "";
r += nfa()->get_name();
r += get_nfa()->get_name();
r += "(";
r += nth(0)->dump();
for (unsigned n = 1; n < size(); ++n)
@ -112,7 +112,7 @@ namespace spot
}
const spot::ltl::nfa::ptr
automatop::nfa() const
automatop::get_nfa() const
{
assert(nfa_ != 0);
return nfa_;

2
src/ltlast/automatop.hh
View file

@ -66,7 +66,7 @@ namespace spot
formula* nth(unsigned n);
/// Get the NFA of this operator.
const spot::ltl::nfa::ptr nfa() const;
const spot::ltl::nfa::ptr get_nfa() const;
/// Whether the automaton is negated.
bool is_negated() const;

2
src/ltlvisit/clone.cc
View file

@ -71,7 +71,7 @@ namespace spot
automatop::vec* res = new automatop::vec;
for (unsigned i = 0; i < ao->size(); ++i)
res->push_back(recurse(ao->nth(i)));
result_ = automatop::instance(ao->nfa(), res, ao->is_negated());
result_ = automatop::instance(ao->get_nfa(), res, ao->is_negated());
}
void

2
src/ltlvisit/nenoform.cc
View file

@ -166,7 +166,7 @@ namespace spot
unsigned aos = ao->size();
for (unsigned i = 0; i < aos; ++i)
res->push_back(recurse(ao->nth(i)));
result_ = automatop::instance(ao->nfa(), res, negated);
result_ = automatop::instance(ao->get_nfa(), res, negated);
}
void

4
src/ltlvisit/tostring.cc
View file

@ -167,7 +167,7 @@ namespace spot
top_level_ = false;
if (!top_level)
os_ << "(";
os_ << ao->nfa()->get_name() << "(";
os_ << ao->get_nfa()->get_name() << "(";
unsigned max = ao->size();
ao->nth(0)->accept(*this);
for (unsigned n = 1; n < max; ++n)
@ -324,7 +324,7 @@ namespace spot
top_level_ = false;
if (!top_level)
os_ << "(";
os_ << ao->nfa()->get_name() << "(";
os_ << ao->get_nfa()->get_name() << "(";
unsigned max = ao->size();
ao->nth(0)->accept(*this);
for (unsigned n = 1; n < max; ++n)

4
src/tgba/tgbasafracomplement.cc
View file

@ -815,7 +815,7 @@ namespace spot
void print_safra_automaton(safra_tree_automaton* a)
{
safra_tree_automaton::automaton_t node_list = a->automaton;
typedef safra_tree_automaton::automaton_t::const_reverse_iterator
typedef safra_tree_automaton::automaton_t::reverse_iterator
automaton_cit;
typedef safra_tree_automaton::transition_list::const_iterator
trans_cit;
@ -825,6 +825,8 @@ namespace spot
std::cout << "digraph A {" << std::endl;
/// GCC 3.3 complains if a const_reverse_iterator is used.
/// error: no match for 'operator!='
for (automaton_cit i = a->automaton.rbegin();
i != a->automaton.rend();
++i)

6
src/tgbaalgos/eltl2tgba_lacim.cc
View file

@ -170,12 +170,12 @@ namespace spot
v.push_back(const_cast<formula*>(node->nth(i)));
std::pair<int, int> vp =
recurse_state(node->nfa(),
node->nfa()->get_init_state(), v, m, acc, finish);
recurse_state(node->get_nfa(),
node->get_nfa()->get_init_state(), v, m, acc, finish);
// Update finish_ with finish(node).
// FIXME: when node is loop, it does not make sense; hence the bddtrue.
finish_[node] = !node->nfa()->is_loop() ? bddtrue : finish;
finish_[node] = !node->get_nfa()->is_loop() ? bddtrue : finish;
bdd tmp = bddtrue;
for (nmap::iterator it = m.begin(); it != m.end(); ++it)