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

Address several issues reported by cppcheck all over the place.

Browse source 
* src/bin/common_finput.cc, src/tgbaalgos/lbtt.cc: Use !empty() instead
of size() > 0.
* src/bin/ltl2tgta.cc, src/kripke/kripkeexplicit.cc,
src/tgbatest/complementation.cc: Avoid useless assignments.
* src/bin/ltlcross.cc: Correct mistaken assignment inside assert().
* src/evtgba/symbol.hh, src/tgba/tgbabddcoredata.cc,
src/tgba/tgbabddcoredata.hh,
src/tgba/tgbasafracomplement.cc (operator=): Do not return a const
reference.
* src/evtgbatest/ltl2evtgba.cc, src/evtgbatest/product.cc,
src/evtgbatest/product.cc: Check indices before using them, not after.
* src/kripke/kripkeexplicit.cc, src/kripke/kripkeexplicit.hh,
src/tgbatest/randtgba.cc: Pass constant strings by reference.
* src/kripke/kripkeprint.cc, src/tgbaalgos/simulation.cc:
Remove a useless operation.
* src/ltlvisit/simplify.cc: Remove a duplicate condition.
* src/misc/formater.hh: Remove unused attribute.
* src/misc/modgray.cc: Initialize done_ in the constructor.
* src/saba/explicitstateconjunction.cc,
src/saba/explicitstateconjunction.hh (operator=): Fix prototype.
* src/saba/sabacomplementtgba.cc: Remove unused default constructor.
* src/ta/taexplicit.cc, src/ta/taproduct.cc, src/ta/tgtaproduct.cc,
src/ta/tgtaproduct.hh, src/taalgos/emptinessta.cc,
src/taalgos/minimize.cc, src/taalgos/reachiter.cc,
src/taalgos/tgba2ta.cc, src/tgbaalgos/cutscc.cc: Use C++ casts, and
++it instead of it++.
* src/taalgos/dotty.cc, src/tgbatest/ltl2tgba.cc: Refine the scope of
variables.
* src/tgba/tgbakvcomplement.hh (bdd_order): Always initialize bdd_.
* src/tgba/tgbasgba.cc, src/tgba/wdbacomp.cc: Use the initialization
line to initialize all members.
This commit is contained in:
Alexandre Duret-Lutz 2012-12-20 17:18:56 +01:00
parent a3b49f1108
commit a577850eb3
36 changed files with 117 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/taalgos/dotty.cc
View file

@ -1,3 +1,4 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2010, 2012 Laboratoire de Recherche et Developpement
// de l Epita (LRDE).
//
@ -40,8 +41,6 @@ namespace spot
{
os_ << "digraph G {" << std::endl;
int n = 0;
artificial_initial_state_ = t_automata_->get_artificial_initial_state();
ta::states_set_t init_states_set;
@ -55,10 +54,10 @@ namespace spot
}
else
{
int n = 0;
init_states_set = t_automata_->get_initial_states_set();
for (it = init_states_set.begin();
it != init_states_set.end(); it++)
it != init_states_set.end(); ++it)
{
bdd init_condition = t_automata_->get_state_condition(*it);
std::string label = bdd_format_formula(t_automata_->get_dict(),

7
src/taalgos/emptinessta.cc
View file

@ -1,5 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2010, 2011, 2012 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
// Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
@ -360,7 +361,7 @@ namespace spot
}
std::set<const state*, state_ptr_less_than>::const_iterator it;
for (it = liveset_dest.begin(); it != liveset_dest.end(); it++)
for (it = liveset_dest.begin(); it != liveset_dest.end(); ++it)
{
const state* succ = (*it);
if (heuristic_livelock_detection(succ, h, h_livelock_root,
@ -442,7 +443,7 @@ namespace spot
const ta::states_set_t init_states_set = a_->get_initial_states_set();
ta::states_set_t::const_iterator it;
for (it = init_states_set.begin(); it != init_states_set.end(); it++)
for (it = init_states_set.begin(); it != init_states_set.end(); ++it)
{
state* init_state = (*it);
ta_init_it_.push(init_state);

2
src/taalgos/minimize.cc
View file

@ -205,7 +205,7 @@ namespace spot
spot::state* artificial_initial_state = ta_->get_artificial_initial_state();
for (it = states_set.begin(); it != states_set.end(); it++)
for (it = states_set.begin(); it != states_set.end(); ++it)
{
const state* s = (*it);

5
src/taalgos/reachiter.cc
View file

@ -1,4 +1,5 @@
// Copyright (C) 2010 Laboratoire de Recherche et Developpement
// -*- coding: utf-8 -*-
// Copyright (C) 2010, 2012 Laboratoire de Recherche et Développement
// de l Epita (LRDE).
//
//
@ -66,7 +67,7 @@ namespace spot
init_states_set = t_automata_->get_initial_states_set();
}
for (it = init_states_set.begin(); it != init_states_set.end(); it++)
for (it = init_states_set.begin(); it != init_states_set.end(); ++it)
{
state* init_state = (*it);
if (want_state(init_state))

16
src/taalgos/tgba2ta.cc
View file

@ -76,7 +76,7 @@ namespace spot
state_ta_explicit::transitions* transitions_to_livelock_states =
new state_ta_explicit::transitions;
for (it = states_set.begin(); it != states_set.end(); it++)
for (it = states_set.begin(); it != states_set.end(); ++it)
{
state_ta_explicit* source = static_cast<state_ta_explicit*> (*it);
@ -122,8 +122,8 @@ namespace spot
{
state_ta_explicit::transitions::iterator it_trans;
for (it_trans = transitions_to_livelock_states->begin(); it_trans
!= transitions_to_livelock_states->end(); it_trans++)
for (it_trans = transitions_to_livelock_states->begin();
it_trans != transitions_to_livelock_states->end(); ++it_trans)
{
if (artificial_livelock_accepting_state != 0)
{
@ -147,7 +147,7 @@ namespace spot
}
delete transitions_to_livelock_states;
for (it = states_set.begin(); it != states_set.end(); it++)
for (it = states_set.begin(); it != states_set.end(); ++it)
{
state_ta_explicit* state = static_cast<state_ta_explicit*> (*it);
@ -196,7 +196,7 @@ compute_livelock_acceptance_states(ta_explicit* testing_automata,
ta::states_set_t::const_iterator it;
ta::states_set_t init_states = testing_automata->get_initial_states_set();
for (it = init_states.begin(); it != init_states.end(); it++)
for (it = init_states.begin(); it != init_states.end(); ++it)
{
state* init_state = (*it);
init_set.push(init_state);
@ -610,7 +610,7 @@ compute_livelock_acceptance_states(ta_explicit* testing_automata,
// adapt a GTA to remove acceptance conditions from states
ta::states_set_t states_set = ta->get_states_set();
ta::states_set_t::iterator it;
for (it = states_set.begin(); it != states_set.end(); it++)
for (it = states_set.begin(); it != states_set.end(); ++it)
{
state_ta_explicit* state = static_cast<state_ta_explicit*> (*it);
@ -621,7 +621,7 @@ compute_livelock_acceptance_states(ta_explicit* testing_automata,
state_ta_explicit::transitions::iterator it_trans;
for (it_trans = trans->begin(); it_trans != trans->end();
it_trans++)
++it_trans)
{
(*it_trans)->acceptance_conditions
= ta->all_acceptance_conditions();
@ -674,7 +674,7 @@ compute_livelock_acceptance_states(ta_explicit* testing_automata,
bdd bdd_stutering_transition = bdd_setxor(first_state_condition,
first_state_condition);
for (it = states_set.begin(); it != states_set.end(); it++)
for (it = states_set.begin(); it != states_set.end(); ++it)
{
state_ta_explicit* state = static_cast<state_ta_explicit*> (*it);