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

Replace << "c" by << 'c', and check for it in style.sh

Browse source 
* src/sanity/style.test: Add a test.
* iface/dve2/dve2.cc, iface/dve2/dve2check.cc, src/bin/common_output.cc,
src/bin/dstar2tgba.cc, src/bin/ltl2tgba.cc, src/bin/ltlcross.cc,
src/dstarparse/dra2ba.cc, src/dstarparse/fmterror.cc,
src/dstarparse/nsa2tgba.cc, src/kripke/kripkeprint.cc,
src/kripkeparse/fmterror.cc, src/ltlast/atomic_prop.cc,
src/ltlast/bunop.cc, src/ltltest/ltlrel.cc, src/ltltest/reduc.cc,
src/ltltest/syntimpl.cc, src/ltlvisit/dotty.cc, src/ltlvisit/lbt.cc,
src/ltlvisit/randomltl.cc, src/ltlvisit/relabel.cc,
src/ltlvisit/simplify.cc, src/ltlvisit/tostring.cc, src/misc/bitvect.cc,
src/misc/optionmap.cc, src/misc/timer.cc, src/neverparse/fmterror.cc,
src/priv/freelist.cc, src/saba/sabacomplementtgba.cc,
src/sabaalgos/sabadotty.cc, src/taalgos/dotty.cc,
src/taalgos/minimize.cc, src/tgba/bdddict.cc, src/tgba/bddprint.cc,
src/tgba/futurecondcol.cc, src/tgba/taatgba.hh,
src/tgba/tgbakvcomplement.cc, src/tgba/tgbasafracomplement.cc,
src/tgbaalgos/compsusp.cc, src/tgbaalgos/cycles.cc,
src/tgbaalgos/dotty.cc, src/tgbaalgos/dtbasat.cc,
src/tgbaalgos/dtgbasat.cc, src/tgbaalgos/emptiness.cc,
src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gv04.cc,
src/tgbaalgos/lbtt.cc, src/tgbaalgos/ltl2tgba_fm.cc,
src/tgbaalgos/minimize.cc, src/tgbaalgos/neverclaim.cc,
src/tgbaalgos/powerset.cc, src/tgbaalgos/replayrun.cc,
src/tgbaalgos/save.cc, src/tgbaalgos/scc.cc, src/tgbaalgos/sccfilter.cc,
src/tgbaalgos/weight.cc, src/tgbaalgos/word.cc,
src/tgbaparse/fmterror.cc, src/tgbatest/bitvect.cc,
src/tgbatest/complementation.cc, src/tgbatest/intvcmp2.cc,
src/tgbatest/intvcomp.cc, src/tgbatest/ltl2tgba.cc,
src/tgbatest/randtgba.cc: Replace << "c" by << 'c' when
appropriate.
This commit is contained in:
Alexandre Duret-Lutz 2014-01-29 14:48:52 +01:00
parent 49c66c6319
commit ba5aff2460
64 changed files with 417 additions and 398 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ltlvisit/dotty.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2009, 2010, 2011, 2012, 2013 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
// Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Laboratoire de
// Recherche et Développement de l'Epita (LRDE).
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6
// (LIP6), département Systèmes Répartis Coopératifs (SRC), Université
// Pierre et Marie Curie.
@ -160,7 +160,7 @@ namespace spot
os_ << " [taillabel=\"L\"]";
else if (childnum == -2)
os_ << " [taillabel=\"R\"]";
os_ << ";" << std::endl;
os_ << ';' << std::endl;
}
father_ = node;
@ -190,7 +190,7 @@ namespace spot
os << "digraph G {" << std::endl;
f->accept(v);
v.finish();
os << "}" << std::endl;
os << '}' << std::endl;
return os;
}

30
src/ltlvisit/lbt.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2012, 2013 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
// Copyright (C) 2012, 2013, 2014 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
@ -88,10 +88,10 @@ namespace spot
switch (c->val())
{
case constant::False:
os_ << "f";
os_ << 'f';
break;
case constant::True:
os_ << "t";
os_ << 't';
break;
case constant::EmptyWord:
assert(!"unsupported constant");
@ -106,25 +106,25 @@ namespace spot
switch (bo->op())
{
case binop::Xor:
os_ << "^";
os_ << '^';
break;
case binop::Implies:
os_ << "i";
os_ << 'i';
break;
case binop::Equiv:
os_ << "e";
os_ << 'e';
break;
case binop::U:
os_ << "U";
os_ << 'U';
break;
case binop::R:
os_ << "V";
os_ << 'V';
break;
case binop::W:
os_ << "W";
os_ << 'W';
break;
case binop::M:
os_ << "M";
os_ << 'M';
break;
case binop::UConcat:
case binop::EConcat:
@ -149,16 +149,16 @@ namespace spot
switch (uo->op())
{
case unop::Not:
os_ << "!";
os_ << '!';
break;
case unop::X:
os_ << "X";
os_ << 'X';
break;
case unop::F:
os_ << "F";
os_ << 'F';
break;
case unop::G:
os_ << "G";
os_ << 'G';
break;
case unop::Finish:
case unop::Closure:

2
src/ltlvisit/randomltl.cc
View file

@ -291,7 +291,7 @@ namespace spot
random_formula::dump_priorities(std::ostream& os) const
{
for (unsigned i = 0; i < proba_size_; ++i)
os << proba_[i].name << "\t" << proba_[i].proba << std::endl;
os << proba_[i].name << '\t' << proba_[i].proba << '\n';
return os;
}

12
src/ltlvisit/relabel.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2012, 2013 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
// Copyright (C) 2012, 2013, 2014 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
@ -57,7 +57,7 @@ namespace spot
const formula* next()
{
std::ostringstream s;
s << "p" << nn++;
s << 'p' << nn++;
return default_environment::instance().require(s.str());
}
};
@ -401,7 +401,7 @@ namespace spot
while (!s.empty())
{
// std::cerr << "-- visiting " << to_string(s.top().parent) << "\n";
// std::cerr << "-- visiting " << to_string(s.top().parent) << '\n';
stack_entry& e = s.top();
if (e.current_child != e.last_child)
{
@ -414,8 +414,8 @@ namespace spot
continue;
}
// std::cerr << " grand parent is "
// << to_string(e.grand_parent) << "\n"
// << " child is " << to_string(child) << "\n";
// << to_string(e.grand_parent)
// << "\n child is " << to_string(child) << '\n';
data_entry d = { num, num };
std::pair<fmap_t::iterator, bool> i =
data.insert(fmap_t::value_type(child, d));

2
src/ltlvisit/simplify.cc
View file

@ -4323,7 +4323,7 @@ namespace spot
static int srec = 0;
for (int i = srec; i; --i)
trace << ' ';
trace << "** simplify_recursively(" << to_string(f) << ")";
trace << "** simplify_recursively(" << to_string(f) << ')';
#endif
const formula* result = c->lookup_simplified(f);

38
src/ltlvisit/tostring.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2008, 2010, 2012, 2013 Laboratoire de Recherche et
// Développement de l'Epita (LRDE)
// Copyright (C) 2008, 2010, 2012, 2013, 2014 Laboratoire de Recherche
// et Développement de l'Epita (LRDE)
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie.
@ -333,7 +333,7 @@ namespace spot
if (in_ratexp_)
emit(KOpenSERE);
else
os_ << "(";
os_ << '(';
}
void
@ -342,7 +342,7 @@ namespace spot
if (in_ratexp_)
emit(KCloseSERE);
else
os_ << ")";
os_ << ')';
}
std::ostream&
@ -356,7 +356,7 @@ namespace spot
{
std::string str = ap->name();
if (full_parent_)
os_ << "(";
os_ << '(';
if (!is_bare_word(str.c_str()))
{
// Spin 6 supports atomic propositions such as (a == 0)
@ -382,11 +382,11 @@ namespace spot
os_ << "\\mathit{";
os_ << str.substr(0, s);
if (s > 1)
os_ << "}";
os_ << '}';
if (s != str.size())
os_ << "_{"
<< str.substr(s)
<< "}";
<< '}';
}
else
{
@ -396,7 +396,7 @@ namespace spot
if (kw_ == wring_kw)
os_ << "=1";
if (full_parent_)
os_ << ")";
os_ << ')';
}
void
@ -492,7 +492,7 @@ namespace spot
emit(KCloseSERE);
if (bo->second() == constant::true_instance())
{
os_ << "!";
os_ << '!';
in_ratexp_ = false;
goto second_done;
}
@ -501,7 +501,7 @@ namespace spot
top_level_ = false;
break;
case binop::EConcatMarked:
os_ << "}";
os_ << '}';
emit(onelast ? KSeqMarkedNext : KSeqMarked);
in_ratexp_ = false;
top_level_ = false;
@ -676,13 +676,13 @@ namespace spot
need_parent = true;
break;
case unop::Closure:
os_ << "{";
os_ << '{';
in_ratexp_ = true;
top_level_ = true;
break;
case unop::NegClosure:
emit(KNot);
os_ << "{";
os_ << '{';
in_ratexp_ = true;
top_level_ = true;
break;
@ -704,7 +704,7 @@ namespace spot
{
case unop::Closure:
case unop::NegClosure:
os_ << "}";
os_ << '}';
in_ratexp_ = false;
top_level_ = false;
break;
@ -731,18 +731,18 @@ namespace spot
bool top_level = top_level_;
top_level_ = false;
if (!top_level)
os_ << "(";
os_ << ao->get_nfa()->get_name() << "(";
os_ << '(';
os_ << ao->get_nfa()->get_name() << '(';
unsigned max = ao->size();
ao->nth(0)->accept(*this);
for (unsigned n = 1; n < max; ++n)
{
os_ << ",";
os_ << ',';
ao->nth(n)->accept(*this);
}
os_ << ")";
os_ << ')';
if (!top_level)
os_ << ")";
os_ << ')';
}
void
@ -767,7 +767,7 @@ namespace spot
if (i + 2 < max && mo->nth(i) == mo->nth(i + 2))
{
emit(KEqualBunop);
os_ << "1";
os_ << '1';
emit(KCloseBunop);
i += 2;
}