diff --git a/ChangeLog b/ChangeLog index fa13ac98b..a0e459691 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-05-25 Alexandre Duret-Lutz + + * sanity/style.test: Catch misuses of Sgi::. + * tgba/tgbareduc.hh, tgbaalgos/reductgba_sim.cc, + tgbaalgos/reductgba_sim.hh, tgbaalgos/reductgba_sim_del.cc: Fix them. + 2005-05-16 Denis Poitrenaud * src/ltlvisit/syntimpl.cc: Fix a typo. diff --git a/src/sanity/style.test b/src/sanity/style.test index 30d1d586e..bd83e51c4 100755 --- a/src/sanity/style.test +++ b/src/sanity/style.test @@ -146,6 +146,12 @@ for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do grep '[^a-zA-Z0-9_](\*[a-zA-Z0-9_]*)\.' $tmp && diag 'Use "x->y", not "(*x).y"' + grep 'std::hash' $tmp && + diag 'use Sgi:: for hash and hash_map' + + grep 'Sgi::[^h]' $tmp && + diag 'Sgi:: is for hash and hash_map only' + res=`perl -ne '$/ = undef; print "$&\n" while /if \((.*)(\s*==\s*0)?\)\s*delete(\[\])?\s+\1;(?!\s+else)/g' $tmp` diff --git a/src/tgba/tgbareduc.hh b/src/tgba/tgbareduc.hh index a58058eab..9d486b69a 100644 --- a/src/tgba/tgbareduc.hh +++ b/src/tgba/tgbareduc.hh @@ -31,12 +31,12 @@ namespace spot { - typedef Sgi::pair state_couple; - typedef Sgi::vector simulation_relation; + typedef std::pair state_couple; + typedef std::vector simulation_relation; /* - typedef Sgi::vector direct_simulation_relation; - typedef Sgi::vector delayed_simulation_relation; + typedef std::vector direct_simulation_relation; + typedef std::vector delayed_simulation_relation; */ class direct_simulation_relation: public simulation_relation diff --git a/src/tgbaalgos/reductgba_sim.cc b/src/tgbaalgos/reductgba_sim.cc index 5cf055443..7590c027f 100644 --- a/src/tgbaalgos/reductgba_sim.cc +++ b/src/tgbaalgos/reductgba_sim.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), +// Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), // département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // @@ -97,13 +97,13 @@ namespace spot spoiler_node::set_win() { bool change = not_win; - for (Sgi::vector::iterator i = lnode_succ->begin(); + for (std::vector::iterator i = lnode_succ->begin(); i != lnode_succ->end(); ++i) { not_win |= (*i)->not_win; } if (change != not_win) - for (Sgi::vector::iterator i = lnode_pred->begin(); + for (std::vector::iterator i = lnode_pred->begin(); i != lnode_pred->end(); ++i) (*i)->set_win(); @@ -195,14 +195,14 @@ namespace spot else { not_win = true; - for (Sgi::vector::iterator i = lnode_succ->begin(); + for (std::vector::iterator i = lnode_succ->begin(); i != lnode_succ->end(); ++i) { not_win &= (*i)->not_win; } } if (change != not_win) - for (Sgi::vector::iterator i = lnode_pred->begin(); + for (std::vector::iterator i = lnode_pred->begin(); i != lnode_pred->end(); ++i) (*i)->set_win(); @@ -292,8 +292,8 @@ namespace spot void parity_game_graph::print(std::ostream& os) { - Sgi::vector::iterator i1; - Sgi::vector::iterator i2; + std::vector::iterator i1; + std::vector::iterator i2; int n = 0; @@ -359,8 +359,8 @@ namespace spot parity_game_graph::~parity_game_graph() { - Sgi::vector::iterator i1; - Sgi::vector::iterator i2; + std::vector::iterator i1; + std::vector::iterator i2; for (i1 = spoiler_vertice_.begin(); i1 != spoiler_vertice_.end(); ++i1) @@ -392,18 +392,18 @@ namespace spot parity_game_graph_direct::build_graph() { tgba_succ_iterator* si = 0; - typedef Sgi::pair couple_bdd; + typedef std::pair couple_bdd; couple_bdd *p = 0; - Sgi::vector* trans = 0; + std::vector* trans = 0; bool exist = false; spot::state* s = 0; - for (Sgi::vector::iterator i = tgba_state_.begin(); + for (std::vector::iterator i = tgba_state_.begin(); i != tgba_state_.end(); ++i) { // spoiler node are all state couple (i,j) - for (Sgi::vector::iterator j = tgba_state_.begin(); + for (std::vector::iterator j = tgba_state_.begin(); j != tgba_state_.end(); ++j) { spoiler_node* n1 = new spoiler_node(*i, @@ -414,8 +414,8 @@ namespace spot // duplicator node are all state couple where // the first state i are reachable. - trans = new Sgi::vector; - for (Sgi::vector::iterator j = tgba_state_.begin(); + trans = new std::vector; + for (std::vector::iterator j = tgba_state_.begin(); j != tgba_state_.end(); ++j) { si = automata_->succ_iter(*j); @@ -434,7 +434,7 @@ namespace spot // If an other predecessor of i has the same label p // to reach i, then we don't compute the duplicator node. exist = false; - for (Sgi::vector::iterator v + for (std::vector::iterator v = trans->begin(); v != trans->end(); ++v) { @@ -448,7 +448,7 @@ namespace spot { // We build all the state couple with the label p. trans->push_back(p); - for (Sgi::vector::iterator s + for (std::vector::iterator s = tgba_state_.begin(); s != tgba_state_.end(); ++s) { @@ -470,7 +470,7 @@ namespace spot } delete si; } - Sgi::vector::iterator i2; + std::vector::iterator i2; for (i2 = trans->begin(); i2 != trans->end(); ++i2) { delete *i2; @@ -487,10 +487,10 @@ namespace spot spot::state* s = 0; // for each couple of (spoiler, duplicator) - for (Sgi::vector::iterator i + for (std::vector::iterator i = spoiler_vertice_.begin(); i != spoiler_vertice_.end(); ++i) { - for (Sgi::vector::iterator j + for (std::vector::iterator j = duplicator_vertice_.begin(); j != duplicator_vertice_.end(); ++j) { @@ -547,13 +547,13 @@ namespace spot while (change) { change = false; - for (Sgi::vector::iterator i + for (std::vector::iterator i = duplicator_vertice_.begin(); i != duplicator_vertice_.end(); ++i) { change |= (*i)->set_win(); } - for (Sgi::vector::iterator i + for (std::vector::iterator i = spoiler_vertice_.begin(); i != spoiler_vertice_.end(); ++i) { @@ -569,7 +569,7 @@ namespace spot state_couple* p = 0; seen_map::iterator j; - for (Sgi::vector::iterator i + for (std::vector::iterator i = spoiler_vertice_.begin(); i != spoiler_vertice_.end(); ++i) { diff --git a/src/tgbaalgos/reductgba_sim.hh b/src/tgbaalgos/reductgba_sim.hh index 59f95da73..ce166a2e0 100644 --- a/src/tgbaalgos/reductgba_sim.hh +++ b/src/tgbaalgos/reductgba_sim.hh @@ -86,9 +86,9 @@ namespace spot class spoiler_node; class duplicator_node; - typedef Sgi::vector sn_v; - typedef Sgi::vector dn_v; - typedef Sgi::vector s_v; + typedef std::vector sn_v; + typedef std::vector dn_v; + typedef std::vector s_v; /// \brief Parity game graph which compute a simulation relation. class parity_game_graph : public tgba_reachable_iterator_breadth_first @@ -297,7 +297,7 @@ namespace spot /// Vector which contain all the sub-set of the set /// of acceptance condition. - typedef Sgi::vector bdd_v; + typedef std::vector bdd_v; bdd_v sub_set_acc_cond_; /// Return the number of acceptance condition. diff --git a/src/tgbaalgos/reductgba_sim_del.cc b/src/tgbaalgos/reductgba_sim_del.cc index 8532b8fc5..3e653ce8a 100644 --- a/src/tgbaalgos/reductgba_sim_del.cc +++ b/src/tgbaalgos/reductgba_sim_del.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), +// Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), // département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // @@ -35,7 +35,7 @@ namespace spot static bdd all_acc_cond = bddfalse; - static Sgi::vector bool_v; + static std::vector bool_v; //static int nb_node = 0; @@ -505,7 +505,7 @@ namespace spot duplicator_node_delayed* dn_n = new duplicator_node_delayed(sn, dn, acc, label, nb); - for (Sgi::vector::iterator i + for (std::vector::iterator i = duplicator_vertice_.begin(); i != duplicator_vertice_.end(); ++i) { @@ -536,7 +536,7 @@ namespace spot spoiler_node_delayed* sn_n = new spoiler_node_delayed(sn, dn, acc, nb); - for (Sgi::vector::iterator i + for (std::vector::iterator i = spoiler_vertice_.begin(); i != spoiler_vertice_.end(); ++i) { @@ -564,32 +564,32 @@ namespace spot if (this->nb_set_acc_cond() > 1) { - for (Sgi::vector::iterator i + for (std::vector::iterator i = duplicator_vertice_.begin(); i != duplicator_vertice_.end(); ++i) { /* - for (Sgi::vector::iterator i2 + for (std::vector::iterator i2 = duplicator_vertice_.begin(); i2 != duplicator_vertice_.end(); ++i2) dynamic_cast(*i2)->seen_ = false; - for (Sgi::vector::iterator i3 + for (std::vector::iterator i3 = spoiler_vertice_.begin(); i3 != spoiler_vertice_.end(); ++i3) dynamic_cast(*i3)->seen_ = false; */ dynamic_cast(*i)->set_lead_2_acc_all(); } - for (Sgi::vector::iterator i + for (std::vector::iterator i = spoiler_vertice_.begin(); i != spoiler_vertice_.end(); ++i) { /* - for (Sgi::vector::iterator i2 + for (std::vector::iterator i2 = duplicator_vertice_.begin(); i2 != duplicator_vertice_.end(); ++i2) dynamic_cast(*i2)->seen_ = false; - for (Sgi::vector::iterator i3 + for (std::vector::iterator i3 = spoiler_vertice_.begin(); i3 != spoiler_vertice_.end(); ++i3) dynamic_cast(*i3)->seen_ = false; @@ -606,13 +606,13 @@ namespace spot { //std::cout << "lift::change = true" << std::endl; change = false; - for (Sgi::vector::iterator i + for (std::vector::iterator i = duplicator_vertice_.begin(); i != duplicator_vertice_.end(); ++i) { change |= (*i)->set_win(); } - for (Sgi::vector::iterator i + for (std::vector::iterator i = spoiler_vertice_.begin(); i != spoiler_vertice_.end(); ++i) { @@ -634,7 +634,7 @@ namespace spot return rel; */ - for (Sgi::vector::iterator i + for (std::vector::iterator i = spoiler_vertice_.begin(); i != spoiler_vertice_.end(); ++i) {