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

autfilt: return with exit code 1 if there is no match

Browse source 
* src/bin/autfilt.cc: Return with exit code 1 if no match found.
* src/tgbaalgos/are_isomorphic.cc,src/tgbatest/degenlskip.test
src/tgbatest/explpro2.test,src/tgbatest/explpro3.test
src/tgbatest/explpro4.test,src/tgbatest/explprod.test
src/tgbatest/neverclaimread.test, src/tgbatest/readsave.test
src/tgbatest/tripprod.test: Use exit status to check for output
emptiness instead of 'test -n'.
* src/tgbatest/isomorph.test: Simplify test.
This commit is contained in:
Thibaud Michaud 2014-12-09 14:11:05 +01:00 • committed by Alexandre Duret-Lutz
parent 68adcc70fa
commit b54fe4c035
11 changed files with 48 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/bin/autfilt.cc
View file

@ -49,7 +49,10 @@
static const char argp_program_doc[] ="\
Convert, transform, and filter Büchi automata.\n\
";
Exit status:\n\
0 if some automata were output\n\
1 if no automata were output (no match)\n\
2 if any error has been reported";
#define OPT_TGBA 1
@ -151,6 +154,7 @@ static const struct argp_child children[] =
static enum output_format { Dot, Lbtt, Lbtt_t, Spin, Spot, Stats, Hoa }
format = Dot;
static bool one_match = false;
static const char* stats = "";
static const char* hoa_opt = 0;
static spot::option_map extra_options;
@ -412,8 +416,8 @@ namespace
auto aut = haut->aut;
// Do this first, because it is cheap and will help most
// algorithms.
// Preprocessing.
if (opt_merge)
{
aut->merge_transitions();
@ -421,12 +425,23 @@ namespace
opt_are_isomorphic->merge_transitions();
}
// Filters.
bool matched = true;
if (opt_isomorph)
matched &= !are_isomorphic(aut, opt_isomorph).empty();
one_match |= matched;
if (!matched)
return 0;
// Postprocessing.
if (opt_product)
aut = spot::product(std::move(aut), opt_product);
if (opt_isomorph && are_isomorphic(aut, opt_isomorph).empty())
return 0;
aut = post.run(aut, nullptr);
if (randomize_st || randomize_tr)
@ -534,5 +549,5 @@ main(int argc, char** argv)
{
error(2, 0, "%s", e.what());
}
return 0;
return one_match ? 0 : 1;
}