Replace << "c" by << 'c', and check for it in style.sh
* 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
parent
49c66c6319
commit
ba5aff2460
64 changed files with 417 additions and 398 deletions
|
|
@ -1,5 +1,5 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2013 Laboratoire de Recherche et Développement
|
||||
// Copyright (C) 2013, 2014 Laboratoire de Recherche et Développement
|
||||
// de l'Epita (LRDE).
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
|
|
@ -27,14 +27,14 @@ void ruler()
|
|||
if (x % 10 == 0)
|
||||
std::cout << x / 10;
|
||||
else
|
||||
std::cout << "_";
|
||||
std::cout << '_';
|
||||
std::cout << "\n ";
|
||||
for (size_t x = 0; x < 76; ++x)
|
||||
std::cout << x % 10;
|
||||
std::cout << "\n\n";
|
||||
}
|
||||
|
||||
#define ECHO(name) std::cout << #name": " << *name << "\n"
|
||||
#define ECHO(name) std::cout << #name": " << *name << '\n'
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
// Copyright (C) 2008, 2009, 2010, 2011, 2012 Laboratoire de Recherche et
|
||||
// Développement de l'Epita (LRDE).
|
||||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014 Laboratoire de
|
||||
// Recherche et Développement de l'Epita (LRDE).
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
|
|
@ -110,7 +111,7 @@ int main(int argc, char* argv[])
|
|||
print_formula = true; break;
|
||||
default:
|
||||
std::cerr << "unrecognized option `-" << argv[i][1]
|
||||
<< "'" << std::endl;
|
||||
<< '\'' << std::endl;
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
// Copyright (C) 2011 Laboratoire de Recherche et Developpement de
|
||||
// l'Epita (LRDE).
|
||||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2011, 2014 Laboratoire de Recherche et Developpement
|
||||
// de l'Epita (LRDE).
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
|
|
@ -29,7 +30,7 @@ int check_aa(int* data, int size, unsigned expected = 0)
|
|||
|
||||
std::cout << "AC[" << csize << "] ";
|
||||
for (size_t i = 0; i < csize; ++i)
|
||||
std::cout << comp[i] << " ";
|
||||
std::cout << comp[i] << ' ';
|
||||
std::cout << std::endl;
|
||||
|
||||
int* decomp = new int[size + 30];
|
||||
|
|
@ -37,7 +38,7 @@ int check_aa(int* data, int size, unsigned expected = 0)
|
|||
|
||||
std::cout << "AD[" << size << "] ";
|
||||
for (int i = 0; i < size; ++i)
|
||||
std::cout << decomp[i] << " ";
|
||||
std::cout << decomp[i] << ' ';
|
||||
std::cout << std::endl;
|
||||
|
||||
int res = memcmp(data, decomp, size * sizeof(int));
|
||||
|
|
@ -47,7 +48,7 @@ int check_aa(int* data, int size, unsigned expected = 0)
|
|||
std::cout << "*** cmp error *** " << res << std::endl;
|
||||
std::cout << "AE[" << size << "] ";
|
||||
for (int i = 0; i < size; ++i)
|
||||
std::cout << data[i] << " ";
|
||||
std::cout << data[i] << ' ';
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
// Copyright (C) 2011 Laboratoire de Recherche et Developpement de
|
||||
// l'Epita (LRDE).
|
||||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2011, 2014 Laboratoire de Recherche et Developpement
|
||||
// de l'Epita (LRDE).
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
|
|
@ -33,16 +34,16 @@ int check_vv(int* data, int size, unsigned expected = 0)
|
|||
|
||||
std::cout << "WC[" << output.size() << "] ";
|
||||
for (size_t i = 0; i < output.size(); ++i)
|
||||
std::cout << output[i] << " ";
|
||||
std::cout << std::endl;
|
||||
std::cout << output[i] << ' ';
|
||||
std::cout << '\n';
|
||||
|
||||
std::vector<int> decomp;
|
||||
spot::int_vector_vector_decompress(output, decomp, size);
|
||||
|
||||
std::cout << "WD[" << decomp.size() << "] ";
|
||||
for (size_t i = 0; i < decomp.size(); ++i)
|
||||
std::cout << decomp[i] << " ";
|
||||
std::cout << std::endl;
|
||||
std::cout << decomp[i] << ' ';
|
||||
std::cout << '\n';
|
||||
|
||||
int res = (decomp != input);
|
||||
|
||||
|
|
@ -51,8 +52,8 @@ int check_vv(int* data, int size, unsigned expected = 0)
|
|||
std::cout << "*** cmp error *** " << std::endl;
|
||||
std::cout << "WE[" << size << "] ";
|
||||
for (int i = 0; i < size; ++i)
|
||||
std::cout << data[i] << " ";
|
||||
std::cout << std::endl;
|
||||
std::cout << data[i] << ' ';
|
||||
std::cout << '\n';
|
||||
}
|
||||
|
||||
if (expected && (output.size() * sizeof(int) != expected))
|
||||
|
|
@ -63,7 +64,7 @@ int check_vv(int* data, int size, unsigned expected = 0)
|
|||
res = 1;
|
||||
}
|
||||
|
||||
std::cout << std::endl;
|
||||
std::cout << '\n';
|
||||
|
||||
return !!res;
|
||||
}
|
||||
|
|
@ -75,16 +76,16 @@ int check_av(int* data, int size, unsigned expected = 0)
|
|||
|
||||
std::cout << "VC[" << v->size() << "] ";
|
||||
for (size_t i = 0; i < v->size(); ++i)
|
||||
std::cout << (*v)[i] << " ";
|
||||
std::cout << std::endl;
|
||||
std::cout << (*v)[i] << ' ';
|
||||
std::cout << '\n';
|
||||
|
||||
int* decomp = new int[size];
|
||||
spot::int_vector_array_decompress(v, decomp, size);
|
||||
|
||||
std::cout << "VD[" << size << "] ";
|
||||
for (int i = 0; i < size; ++i)
|
||||
std::cout << decomp[i] << " ";
|
||||
std::cout << std::endl;
|
||||
std::cout << decomp[i] << ' ';
|
||||
std::cout << '\n';
|
||||
|
||||
int res = memcmp(data, decomp, size * sizeof(int));
|
||||
|
||||
|
|
@ -93,8 +94,8 @@ int check_av(int* data, int size, unsigned expected = 0)
|
|||
std::cout << "*** cmp error *** " << res << std::endl;
|
||||
std::cout << "VE[" << size << "] ";
|
||||
for (int i = 0; i < size; ++i)
|
||||
std::cout << data[i] << " ";
|
||||
std::cout << std::endl;
|
||||
std::cout << data[i] << ' ';
|
||||
std::cout << '\n';
|
||||
}
|
||||
|
||||
if (expected && (v->size() * sizeof(int) != expected))
|
||||
|
|
@ -105,7 +106,7 @@ int check_av(int* data, int size, unsigned expected = 0)
|
|||
res = 1;
|
||||
}
|
||||
|
||||
std::cout << std::endl;
|
||||
std::cout << '\n';
|
||||
|
||||
delete v;
|
||||
delete[] decomp;
|
||||
|
|
@ -120,16 +121,16 @@ int check_aa(int* data, int size, unsigned expected = 0)
|
|||
|
||||
std::cout << "AC[" << csize << "] ";
|
||||
for (size_t i = 0; i < csize; ++i)
|
||||
std::cout << comp[i] << " ";
|
||||
std::cout << std::endl;
|
||||
std::cout << comp[i] << ' ';
|
||||
std::cout << '\n';
|
||||
|
||||
int* decomp = new int[size];
|
||||
spot::int_array_array_decompress(comp, csize, decomp, size);
|
||||
|
||||
std::cout << "AD[" << size << "] ";
|
||||
for (int i = 0; i < size; ++i)
|
||||
std::cout << decomp[i] << " ";
|
||||
std::cout << std::endl;
|
||||
std::cout << decomp[i] << ' ';
|
||||
std::cout << '\n';
|
||||
|
||||
int res = memcmp(data, decomp, size * sizeof(int));
|
||||
|
||||
|
|
@ -138,8 +139,8 @@ int check_aa(int* data, int size, unsigned expected = 0)
|
|||
std::cout << "*** cmp error *** " << res << std::endl;
|
||||
std::cout << "AE[" << size << "] ";
|
||||
for (int i = 0; i < size; ++i)
|
||||
std::cout << data[i] << " ";
|
||||
std::cout << std::endl;
|
||||
std::cout << data[i] << ' ';
|
||||
std::cout << '\n';
|
||||
}
|
||||
|
||||
if (expected && (csize * sizeof(int) != expected))
|
||||
|
|
@ -150,7 +151,7 @@ int check_aa(int* data, int size, unsigned expected = 0)
|
|||
res = 1;
|
||||
}
|
||||
|
||||
std::cout << std::endl;
|
||||
std::cout << '\n';
|
||||
|
||||
delete[] comp;
|
||||
delete[] decomp;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Laboratoire
|
||||
// de Recherche et Développement de l'Epita (LRDE).
|
||||
// Copyright (C) 2003, 2004, 2005, 2006, 2007 Laboratoire d'Informatique de
|
||||
// Paris 6 (LIP6), département Systèmes Répartis
|
||||
// Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
|
||||
// Laboratoire de Recherche et Développement de l'Epita (LRDE).
|
||||
// Copyright (C) 2003, 2004, 2005, 2006, 2007 Laboratoire
|
||||
// d'Informatique de Paris 6 (LIP6), département Systèmes Répartis
|
||||
// Coopératifs (SRC), Université Pierre et Marie Curie.
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
|
|
@ -529,7 +529,7 @@ main(int argc, char** argv)
|
|||
if (!echeck_inst)
|
||||
{
|
||||
std::cerr << "Failed to parse argument of -e near `"
|
||||
<< err << "'" << std::endl;
|
||||
<< err << '\'' << std::endl;
|
||||
exit(2);
|
||||
}
|
||||
expect_counter_example = true;
|
||||
|
|
@ -547,7 +547,7 @@ main(int argc, char** argv)
|
|||
if (!echeck_inst)
|
||||
{
|
||||
std::cerr << "Failed to parse argument of -e near `"
|
||||
<< err << "'" << std::endl;
|
||||
<< err << '\'' << std::endl;
|
||||
exit(2);
|
||||
}
|
||||
expect_counter_example = false;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
// Copyright (C) 2008, 2009, 2010, 2011, 2012 Laboratoire de Recherche
|
||||
// et Développement de l'Epita (LRDE).
|
||||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014 Laboratoire de
|
||||
// Recherche et Développement de l'Epita (LRDE).
|
||||
// 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.
|
||||
// 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
|
||||
// Université Pierre et Marie Curie.
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
|
|
@ -316,7 +317,7 @@ struct stat_collector
|
|||
{
|
||||
std::ios::fmtflags old = os.flags();
|
||||
os << std::setw(25) << "" << " | "
|
||||
<< std::setw(30) << std::left << title << std::right << "|" << std::endl
|
||||
<< std::setw(30) << std::left << title << std::right << '|' << std::endl
|
||||
<< std::setw(25) << "algorithm"
|
||||
<< " | min < mean < max | total | n"
|
||||
<< std::endl
|
||||
|
|
@ -328,10 +329,10 @@ struct stat_collector
|
|||
{
|
||||
os << std::setw(25) << i->first << " |"
|
||||
<< std::setw(6) << i->second.min
|
||||
<< " "
|
||||
<< ' '
|
||||
<< std::setw(8)
|
||||
<< static_cast<float>(i->second.tot) / i->second.n
|
||||
<< " "
|
||||
<< ' '
|
||||
<< std::setw(6) << i->second.max
|
||||
<< " |";
|
||||
if (total)
|
||||
|
|
@ -436,17 +437,17 @@ print_ar_stats(ar_stats_type& ar_stats, const std::string& s)
|
|||
i != ar_stats.end(); ++i)
|
||||
std::cout << std::setw(25) << i->first << " |"
|
||||
<< std::setw(6) << i->second.min_prefix
|
||||
<< " "
|
||||
<< ' '
|
||||
<< std::setw(8)
|
||||
<< static_cast<float>(i->second.tot_prefix) / i->second.n
|
||||
<< " "
|
||||
<< ' '
|
||||
<< std::setw(6) << i->second.max_prefix
|
||||
<< " |"
|
||||
<< std::setw(6) << i->second.min_cycle
|
||||
<< " "
|
||||
<< ' '
|
||||
<< std::setw(8)
|
||||
<< static_cast<float>(i->second.tot_cycle) / i->second.n
|
||||
<< " "
|
||||
<< ' '
|
||||
<< std::setw(6) << i->second.max_cycle
|
||||
<< " |"
|
||||
<< std::setw(4) << i->second.n
|
||||
|
|
@ -466,18 +467,18 @@ print_ar_stats(ar_stats_type& ar_stats, const std::string& s)
|
|||
std::cout << std::setw(25) << i->first << " |"
|
||||
<< std::setw(6)
|
||||
<< i->second.min_run
|
||||
<< " "
|
||||
<< ' '
|
||||
<< std::setw(8)
|
||||
<< static_cast<float>(i->second.tot_prefix
|
||||
+ i->second.tot_cycle) / i->second.n
|
||||
<< " "
|
||||
<< ' '
|
||||
<< std::setw(6)
|
||||
<< i->second.max_run
|
||||
<< " |"
|
||||
<< std::setw(6) << i->second.tot_prefix
|
||||
<< " "
|
||||
<< ' '
|
||||
<< std::setw(6) << i->second.tot_cycle
|
||||
<< " "
|
||||
<< ' '
|
||||
<< std::setw(8) << i->second.tot_prefix + i->second.tot_cycle
|
||||
<< " |"
|
||||
<< std::setw(4) << i->second.n
|
||||
|
|
@ -796,14 +797,14 @@ main(int argc, char** argv)
|
|||
if (tok)
|
||||
{
|
||||
std::cerr << "failed to parse probabilities near `"
|
||||
<< tok << "'" << std::endl;
|
||||
<< tok << '\'' << std::endl;
|
||||
exit(2);
|
||||
}
|
||||
|
||||
if (opt_l > opt_f)
|
||||
{
|
||||
std::cerr << "-l's argument (" << opt_l << ") should not be larger than "
|
||||
<< "-f's (" << opt_f << ")" << std::endl;
|
||||
<< "-f's (" << opt_f << ')' << std::endl;
|
||||
exit(2);
|
||||
}
|
||||
|
||||
|
|
@ -840,7 +841,7 @@ main(int argc, char** argv)
|
|||
&err);
|
||||
if (ec_algos[i].inst == 0)
|
||||
{
|
||||
std::cerr << "Parse error after `" << err << "'" << std::endl;
|
||||
std::cerr << "Parse error after `" << err << '\'' << std::endl;
|
||||
exit(1);
|
||||
}
|
||||
ec_algos[i].inst->options().set(options);
|
||||
|
|
@ -1059,8 +1060,8 @@ main(int argc, char** argv)
|
|||
}
|
||||
if (opt_z && !opt_paper)
|
||||
std::cout << " [" << run->prefix.size()
|
||||
<< "+" << run->cycle.size()
|
||||
<< "]";
|
||||
<< '+' << run->cycle.size()
|
||||
<< ']';
|
||||
|
||||
if (opt_reduce)
|
||||
{
|
||||
|
|
@ -1088,9 +1089,9 @@ main(int argc, char** argv)
|
|||
{
|
||||
std::cout << " ["
|
||||
<< redrun->prefix.size()
|
||||
<< "+"
|
||||
<< '+'
|
||||
<< redrun->cycle.size()
|
||||
<< "]";
|
||||
<< ']';
|
||||
}
|
||||
delete redrun;
|
||||
}
|
||||
|
|
@ -1234,7 +1235,7 @@ main(int argc, char** argv)
|
|||
|
||||
int n = -1;
|
||||
|
||||
std::cout << std::setw(25) << algo << " " << std::setw(8);
|
||||
std::cout << std::setw(25) << algo << ' ' << std::setw(8);
|
||||
|
||||
ec_iter i = stats["states"].find(algo);
|
||||
if (i != stats["states"].end())
|
||||
|
|
@ -1244,7 +1245,7 @@ main(int argc, char** argv)
|
|||
}
|
||||
else
|
||||
std::cout << "";
|
||||
std::cout << " " << std::setw(8);
|
||||
std::cout << ' ' << std::setw(8);
|
||||
|
||||
i = stats["transitions"].find(algo);
|
||||
if (i != stats["transitions"].end())
|
||||
|
|
@ -1254,7 +1255,7 @@ main(int argc, char** argv)
|
|||
}
|
||||
else
|
||||
std::cout << "";
|
||||
std::cout << " " << std::setw(8);
|
||||
std::cout << ' ' << std::setw(8);
|
||||
|
||||
i = stats["max. depth"].find(algo);
|
||||
if (i != stats["max. depth"].end())
|
||||
|
|
@ -1265,7 +1266,7 @@ main(int argc, char** argv)
|
|||
else
|
||||
std::cout << "";
|
||||
if (n >= 0)
|
||||
std::cout << " " << std::setw(8) << n;
|
||||
std::cout << ' ' << std::setw(8) << n;
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
|
|
@ -1277,14 +1278,14 @@ main(int argc, char** argv)
|
|||
{
|
||||
const std::string algo = ec_algos[ai].name;
|
||||
|
||||
std::cout << std::setw(25) << algo << " " << std::setw(8);
|
||||
std::cout << std::setw(25) << algo << ' ' << std::setw(8);
|
||||
|
||||
ec_iter i = stats2["search space states"].find(algo);
|
||||
if (i != stats2["search space states"].end())
|
||||
std::cout << i->second.tot / i->second.n;
|
||||
else
|
||||
std::cout << "";
|
||||
std::cout << " " << std::setw(8);
|
||||
std::cout << ' ' << std::setw(8);
|
||||
|
||||
i = stats2["(non unique) states for cycle"].find(algo);
|
||||
if (i != stats2["(non unique) states for cycle"].end())
|
||||
|
|
@ -1301,7 +1302,7 @@ main(int argc, char** argv)
|
|||
std::cout << "The check failed for the following seeds:";
|
||||
for (std::set<int>::const_iterator i = failed_seeds.begin();
|
||||
i != failed_seeds.end(); ++i)
|
||||
std::cout << " " << *i;
|
||||
std::cout << ' ' << *i;
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue