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

forbid the use of std::endl on std::cerr

Browse source 
std::cerr will flush after each operator<< by default, so it's simpler
to use \n instead of std::endl, especially if we can merge \n into the
previous string.  Ideally we should prefer \n for std::cout as well,
but there are reasonable cases where we want to call std::endl there,
so it's hard to enforce.

* tests/sanity/style.test: Diagnose occurrences of cerr.*<<.*endl.
* bin/autcross.cc, bin/autfilt.cc, bin/ltlcross.cc, bin/ltlsynt.cc,
spot/tl/formula.cc, spot/twa/bdddict.cc, tests/core/checkpsl.cc,
tests/core/checkta.cc, tests/core/consterm.cc, tests/core/emptchk.cc,
tests/core/equalsf.cc, tests/core/ikwiad.cc, tests/core/kind.cc,
tests/core/length.cc, tests/core/ltlrel.cc, tests/core/parity.cc,
tests/core/randtgba.cc, tests/core/reduc.cc, tests/core/syntimpl.cc,
tests/ltsmin/modelcheck.cc: Fix them.
This commit is contained in:
Alexandre Duret-Lutz 2019-07-15 02:31:13 +02:00
parent b4cced9ba8
commit 09c93a3a3d
21 changed files with 148 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/core/checkpsl.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2014-2016, 2018 Laboratoire de Recherche et
// Copyright (C) 2014-2016, 2018-2019 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
@ -33,7 +33,7 @@
static void
syntax(char* prog)
{
std::cerr << prog << " file" << std::endl;
std::cerr << prog << " file\n";
exit(2);
}

4
tests/core/checkta.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2014-2016, 2018 Laboratoire de Recherche et
// Copyright (C) 2014-2016, 2018, 2019 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
@ -37,7 +37,7 @@
static void
syntax(char* prog)
{
std::cerr << prog << " file" << std::endl;
std::cerr << prog << " file\n";
exit(2);
}

4
tests/core/consterm.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2010-2012, 2015-2016, 2018 Laboratoire de Recherche
// Copyright (C) 2010-2012, 2015-2016, 2018-2019 Laboratoire de Recherche
// et Dévelopement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
@ -28,7 +28,7 @@
static void
syntax(char *prog)
{
std::cerr << prog << " formula" << std::endl;
std::cerr << prog << " formula\n";
exit(2);
}

6
tests/core/emptchk.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2014-2016, 2018 Laboratoire de Recherche et
// Copyright (C) 2014-2016, 2018-2019 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
@ -36,7 +36,7 @@
static void
syntax(char* prog)
{
std::cerr << prog << " file" << std::endl;
std::cerr << prog << " file\n";
exit(2);
}
@ -124,7 +124,7 @@ main(int argc, char** argv)
auto i = spot::make_emptiness_check_instantiator(algo, &err);
if (!i)
{
std::cerr << "Failed to parse `" << err << '\'' << std::endl;
std::cerr << "Failed to parse `" << err << "'\n";
exit(2);
}

4
tests/core/equalsf.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2008-2012, 2014-2016, 2018 Laboratoire de
// Copyright (C) 2008-2012, 2014-2016, 2018-2019 Laboratoire de
// Recherche et Développement de l'Epita (LRDE).
// Copyright (C) 2003, 2004, 2006 Laboratoire d'Informatique de
// Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
@ -36,7 +36,7 @@
static void
syntax(char* prog)
{
std::cerr << prog << " [-E] file" << std::endl;
std::cerr << prog << " [-E] file\n";
exit(2);
}

12
tests/core/ikwiad.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2007-2018 Laboratoire de Recherche et Développement
// Copyright (C) 2007-2019 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
// Copyright (C) 2003-2007 Laboratoire d'Informatique de Paris 6
// (LIP6), département Systèmes Répartis Coopératifs (SRC), Université
@ -396,7 +396,7 @@ checked_main(int argc, char** argv)
if (!echeck_inst)
{
std::cerr << "Failed to parse argument of -e near `"
<< err << '\'' << std::endl;
<< err << "'\n";
exit(2);
}
expect_counter_example = true;
@ -414,7 +414,7 @@ checked_main(int argc, char** argv)
if (!echeck_inst)
{
std::cerr << "Failed to parse argument of -e near `"
<< err << '\'' << std::endl;
<< err << "'\n";
exit(2);
}
expect_counter_example = false;
@ -820,13 +820,13 @@ checked_main(int argc, char** argv)
std::ifstream fin(argv[formula_index]);
if (!fin)
{
std::cerr << "Cannot open " << argv[formula_index] << std::endl;
std::cerr << "Cannot open " << argv[formula_index] << '\n';
exit(2);
}
if (!std::getline(fin, input, '\0'))
{
std::cerr << "Cannot read " << argv[formula_index] << std::endl;
std::cerr << "Cannot read " << argv[formula_index] << '\n';
exit(2);
}
}
@ -952,7 +952,7 @@ checked_main(int argc, char** argv)
<< "\n varnum: " << s.varnum
<< "\n cachesize: " << s.cachesize
<< "\n gbcnum: " << s.gbcnum
<< std::endl;
<< '\n';
bdd_fprintstat(stderr);
dict->dump(std::cerr);
}

6
tests/core/kind.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2010, 2012, 2015, 2016, 2018 Laboratoire de Recherche
// et Developement de l'Epita (LRDE).
// Copyright (C) 2010, 2012, 2015, 2016, 2018, 2019 Laboratoire de
// Recherche et Developement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
@ -28,7 +28,7 @@
static void
syntax(char *prog)
{
std::cerr << prog << " formula" << std::endl;
std::cerr << prog << " formula\n";
exit(2);
}

6
tests/core/length.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2012, 2015, 2016, 2018 Laboratoire de Recherche et
// Developement de l'Epita (LRDE).
// Copyright (C) 2012, 2015-2016, 2018-2019 Laboratoire de Recherche
// et Developement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
@ -28,7 +28,7 @@
static void
syntax(char *prog)
{
std::cerr << prog << " formula" << std::endl;
std::cerr << prog << " formula\n";
exit(2);
}

4
tests/core/ltlrel.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2013-2016, 2018 Laboratoire de Recherche et
// Copyright (C) 2013-2016, 2018-2019 Laboratoire de Recherche et
// Developement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
@ -28,7 +28,7 @@
static void
syntax(char *prog)
{
std::cerr << prog << " formula" << std::endl;
std::cerr << prog << " formula\n";
exit(2);
}

60
tests/core/parity.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2016, 2018 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
// Copyright (C) 2016, 2018-2019 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
@ -174,31 +174,27 @@ static bool is_included(spot::const_twa_graph_ptr left,
auto product = spot::product(left, tmp);
if (!product->is_empty())
{
std::cerr << "======Not included======" << std::endl;
std::cerr << "======Not included======\n";
if (first_left)
std::cerr << "======First automaton======" << std::endl;
std::cerr << "======First automaton======\n";
else
std::cerr << "======Second automaton======" << std::endl;
spot::print_hoa(std::cerr, left);
std::cerr << std::endl;
std::cerr << "======Second automaton======\n";
spot::print_hoa(std::cerr, left) << '\n';
if (first_left)
std::cerr << "======Second automaton======" << std::endl;
std::cerr << "======Second automaton======\n";
else
std::cerr << "======First automaton======" << std::endl;
spot::print_hoa(std::cerr, right);
std::cerr << std::endl;
std::cerr << "======First automaton======\n";
spot::print_hoa(std::cerr, right) << '\n';
if (first_left)
std::cerr << "======!Second automaton======" << std::endl;
std::cerr << "======!Second automaton======\n";
else
std::cerr << "======!First automaton======" << std::endl;
spot::print_hoa(std::cerr, tmp);
std::cerr << std::endl;
std::cerr << "======!First automaton======\n";
spot::print_hoa(std::cerr, tmp) << '\n';
if (first_left)
std::cerr << "======First X !Second======" <<std::endl;
std::cerr << "======First X !Second======\n";
else
std::cerr << "======Second X !First======" <<std::endl;
spot::print_hoa(std::cerr, product);
std::cerr << std::endl;
std::cerr << "======Second X !First======\n";
spot::print_hoa(std::cerr, product) << '\n';
return false;
}
return true;
@ -241,18 +237,16 @@ static bool is_right_parity(spot::const_twa_graph_ptr aut,
target_odd = origin_odd;
if (!(is_max == target_max && is_odd == target_odd))
{
std::cerr << "======Wrong accceptance======" << std::endl;
std::cerr << "======Wrong accceptance======\n";
std::string kind[] = { "max", "min", "same", "any" };
std::string style[] = { "odd", "even", "same", "any" };
std::cerr << "target: " << kind[target_kind] << ' '
<< style[target_style] << std::endl;
std::cerr << "origin: " << kind[origin_max ? 0 : 1] << ' '
<< style[origin_odd ? 0 : 1] << ' '
<< num_sets << std::endl;
std::cerr << "actually: " << kind[is_max ? 0 : 1] << ' '
<< style[is_odd ? 0 : 1] << ' '
<< aut->num_sets() << std::endl;
std::cerr << std::endl;
<< style[target_style]
<< "\norigin: " << kind[origin_max ? 0 : 1] << ' '
<< style[origin_odd ? 0 : 1] << ' ' << num_sets
<< "\nactually: " << kind[is_max ? 0 : 1] << ' '
<< style[is_odd ? 0 : 1] << ' ' << aut->num_sets()
<< "\n\n";
return false;
}
return true;
@ -263,9 +257,8 @@ static bool is_almost_colored(spot::const_twa_graph_ptr aut)
for (auto t: aut->edges())
if (t.acc.count() > 1)
{
std::cerr << "======Not colored======" << std::endl;
spot::print_hoa(std::cerr, aut);
std::cerr << std::endl;
std::cerr << "======Not colored======\n";
spot::print_hoa(std::cerr, aut) << '\n';
return false;
}
return true;
@ -276,9 +269,8 @@ static bool is_colored_printerr(spot::const_twa_graph_ptr aut)
bool result = is_colored(aut);
if (!result)
{
std::cerr << "======Not colored======" << std::endl;
spot::print_hoa(std::cerr, aut);
std::cerr << std::endl;
std::cerr << "======Not colored======\n";
spot::print_hoa(std::cerr, aut) << '\n';
}
return result;
}

114
tests/core/randtgba.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2008-2012, 2014-2018 Laboratoire de Recherche et
// Copyright (C) 2008-2012, 2014-2019 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),
@ -98,58 +98,50 @@ cons_emptiness_check(int num, spot::const_twa_graph_ptr a,
static void
syntax(char* prog)
{
std::cerr << "Usage: "<< prog << " [OPTIONS...] PROPS..." << std::endl
<< std::endl
<< "General Options:" << std::endl
<< " -0 suppress default output, just generate the graph"
<< " in memory" << std::endl
<< " -1 produce minimal output (for our paper)" << std::endl
<< " -g output graph in dot format" << std::endl
<< " -s N seed for the random number generator" << std::endl
<< " -z display statistics about emptiness-check algorithms"
<< std::endl
<< " -Z like -z, but print extra statistics after the run"
<< " of each algorithm" << std::endl
<< std::endl
<< "Graph Generation Options:" << std::endl
<< " -a N F number of acceptance conditions and probability that"
<< " one is true" << std::endl
<< " [0 0.0]" << std::endl
<< " -d F density of the graph [0.2]" << std::endl
<< " -n N number of nodes of the graph [20]" << std::endl
<< " -t F probability of the atomic propositions to be true"
<< " [0.5]" << std::endl
<< " -det generate a deterministic and complete graph [false]"
<< std::endl
<< std::endl
<< "Emptiness-Check Options:" << std::endl
<< " -A FILE use all algorithms listed in FILE" << std::endl
<< " -D degeneralize TGBA for emptiness-check algorithms that"
<< " would" << std::endl
<< " otherwise be skipped (implies -e)" << std::endl
<< " -e N compare result of all "
<< "emptiness checks on N randomly generated graphs" << std::endl
<< " -m try to reduce runs, in a second pass (implies -r)"
<< std::endl
<< " -R N repeat each emptiness-check and accepting run "
<< "computation N times" << std::endl
<< " -r compute and replay accepting runs (implies -e)"
<< std::endl
<< " ar:MODE select the mode MODE for accepting runs computation "
<< "(implies -r)" << std::endl
<< std::endl
<< "Where:" << std::endl
<< " F are floats between 0.0 and 1.0 inclusive" << std::endl
<< " E are floating values" << std::endl
<< " S are `KEY=E, KEY=E, ...' strings" << std::endl
<< " N are positive integers" << std::endl
<< " PROPS are the atomic properties to use on transitions"
<< std::endl
<< "Use -dp to see the list of KEYs." << std::endl
<< std::endl
<< "When -i is used, a random graph a synchronized with"
<< " each formula." << std::endl << "If -e N is additionally used"
<< " N random graphs are generated for each formula." << std::endl;
std::cerr
<< "Usage: " << prog
<< (" [OPTIONS...] PROPS...\n\n"
"General Options:\n"
" -0 suppress default output, just generate the graph"
" in memory\n"
" -1 produce minimal output (for our paper)\n"
" -g output graph in dot format\n"
" -s N seed for the random number generator\n"
" -z display statistics about emptiness-check algorithms\n"
" -Z like -z, but print extra statistics after the run"
" of each algorithm\n\n"
"Graph Generation Options:\n"
" -a N F number of acceptance conditions and probability that"
" one is true\n"
" [0 0.0]\n"
" -d F density of the graph [0.2]\n"
" -n N number of nodes of the graph [20]\n"
" -t F probability of the atomic propositions to be true"
" [0.5]\n"
" -det generate a deterministic and complete graph [false]\n\n"
"Emptiness-Check Options:\n"
" -A FILE use all algorithms listed in FILE\n"
" -D degeneralize TGBA for emptiness-check algorithms that"
" would\n"
" otherwise be skipped (implies -e)\n"
" -e N compare result of all "
"emptiness checks on N randomly generated graphs\n"
" -m try to reduce runs, in a second pass (implies -r)\n"
" -R N repeat each emptiness-check and accepting run "
"computation N times\n"
" -r compute and replay accepting runs (implies -e)\n"
" ar:MODE select the mode MODE for accepting runs computation "
"(implies -r)\n\n"
"Where:\n"
" F are floats between 0.0 and 1.0 inclusive\n"
" E are floating values\n"
" S are `KEY=E, KEY=E, ...' strings\n"
" N are positive integers\n"
" PROPS are the atomic properties to use on transitions\n"
"Use -dp to see the list of KEYs.\n\n"
"When -i is used, a random graph a synchronized with"
" each formula.\nIf -e N is additionally used"
" N random graphs are generated for each formula.\n");
exit(2);
}
@ -161,7 +153,7 @@ to_int(const char* s)
int res = strtol(s, &endptr, 10);
if (*endptr)
{
std::cerr << "Failed to parse `" << s << "' as an integer." << std::endl;
std::cerr << "Failed to parse `" << s << "' as an integer.\n";
exit(1);
}
return res;
@ -174,7 +166,7 @@ to_int_pos(const char* s, const char* arg)
if (res <= 0)
{
std::cerr << "argument of " << arg
<< " (" << res << ") must be positive" << std::endl;
<< " (" << res << ") must be positive\n";
exit(1);
}
return res;
@ -187,7 +179,7 @@ to_int_nonneg(const char* s, const char* arg)
if (res < 0)
{
std::cerr << "argument of " << arg
<< " (" << res << ") must be nonnegative" << std::endl;
<< " (" << res << ") must be nonnegative\n";
exit(1);
}
return res;
@ -201,7 +193,7 @@ to_float(const char* s)
float res = strtod(s, &endptr);
if (*endptr)
{
std::cerr << "Failed to parse `" << s << "' as a float." << std::endl;
std::cerr << "Failed to parse `" << s << "' as a float.\n";
exit(1);
}
return res;
@ -214,7 +206,7 @@ to_float_nonneg(const char* s, const char* arg)
if (res < 0)
{
std::cerr << "argument of " << arg
<< " (" << res << ") must be nonnegative" << std::endl;
<< " (" << res << ") must be nonnegative\n";
exit(1);
}
return res;
@ -544,7 +536,7 @@ main(int argc, char** argv)
if (!*in)
{
delete in;
std::cerr << "Failed to open " << argv[argn] << std::endl;
std::cerr << "Failed to open " << argv[argn] << '\n';
exit(2);
}
}
@ -571,7 +563,7 @@ main(int argc, char** argv)
{
if (options.parse_options(argv[argn]))
{
std::cerr << "Failed to parse " << argv[argn] << std::endl;
std::cerr << "Failed to parse " << argv[argn] << '\n';
exit(2);
}
}
@ -680,7 +672,7 @@ main(int argc, char** argv)
&err);
if (!ec_algos[i].inst)
{
std::cerr << "Parse error after `" << err << '\'' << std::endl;
std::cerr << "Parse error after `" << err << "'\n";
exit(1);
}
ec_algos[i].inst->options().set(options);

10
tests/core/reduc.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*_
// Copyright (C) 2008-2012, 2014-2016, 2018 Laboratoire
// Copyright (C) 2008-2012, 2014-2016, 2018-2019 Laboratoire
// de Recherche et Développement de l'Epita (LRDE).
// Copyright (C) 2004, 2006, 2007 Laboratoire d'Informatique de Paris
// 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
@ -35,7 +35,7 @@
static void
syntax(char* prog)
{
std::cerr << prog << " option formula1 (formula2)?" << std::endl;
std::cerr << prog << " option formula1 (formula2)?\n";
exit(2);
}
@ -162,7 +162,7 @@ main(int argc, char** argv)
fin = new std::ifstream(argv[2]);
if (!*fin)
{
std::cerr << "Cannot open " << argv[2] << std::endl;
std::cerr << "Cannot open " << argv[2] << '\n';
exit(2);
}
}
@ -196,7 +196,7 @@ main(int argc, char** argv)
{
if (readfile)
{
std::cerr << "Cannot read from file and check result." << std::endl;
std::cerr << "Cannot read from file and check result.\n";
exit(2);
}
@ -232,7 +232,7 @@ main(int argc, char** argv)
if (!simp->are_equivalent(input_f, maybe_larger))
{
std::cerr << "Incorrect reduction (reduce_size_strictly=0) from `"
<< f1s_before << "' to `" << f1l << "'." << std::endl;
<< f1s_before << "' to `" << f1l << "'.\n";
exit_code = 3;
}
}

4
tests/core/syntimpl.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2008-2012, 2014-2016, 2018 Laboratoire de Recherche
// Copyright (C) 2008-2012, 2014-2016, 2018-2019 Laboratoire de Recherche
// et Développement de l'Epita (LRDE).
// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6
// (LIP6), département Systèmes Répartis Coopératifs (SRC), Université
@ -32,7 +32,7 @@
static void
syntax(char* prog)
{
std::cerr << prog << " formula1 formula2?" << std::endl;
std::cerr << prog << " formula1 formula2?\n";
exit(2);
}