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

bin: abort autcross on input parse error

Browse source 
* bin/common_hoaread.hh (hoa_processor): Add a abort_on_error
option.
* bin/autcross.cc: Use it.
* tests/core/autcross4.test: Add many more error cases to improve
coverage.
This commit is contained in:
Alexandre Duret-Lutz 2018-05-21 13:21:37 +02:00
parent faca835a5e
commit 1f9f3c77ea
4 changed files with 42 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
bin/autcross.cc
View file

@ -542,7 +542,7 @@ namespace
autcross_runner runner;
public:
autcross_processor()
: hoa_processor(spot::make_bdd_dict()), runner(dict_)
: hoa_processor(spot::make_bdd_dict(), true), runner(dict_)
{
}
@ -829,13 +829,13 @@ main(int argc, char** argv)
if (int err = argp_parse(&ap, argc, argv, ARGP_NO_HELP, nullptr, nullptr))
exit(err);
check_no_automaton();
auto s = tools.size();
if (s == 0)
error(2, 0, "No tool to run? Run '%s --help' for usage.",
program_name);
check_no_automaton();
if (s == 1 && !opt_language_preserved && !no_checks)
error(2, 0, "Since --language-preserved is not used, you need "
"at least two tools to compare.");
@ -845,8 +845,7 @@ main(int argc, char** argv)
setup_sig_handler();
autcross_processor p;
if (p.run())
return 2;
p.run();
if (round_num == 0)
{

9
bin/common_hoaread.hh
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2015, 2017 Laboratoire de Recherche et Développement de
// Copyright (C) 2015, 2017, 2018 Laboratoire de Recherche et Développement de
// l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
@ -45,10 +45,11 @@ class hoa_processor: public job_processor
{
protected:
spot::bdd_dict_ptr dict_;
bool abort_on_error_;
public:
hoa_processor(spot::bdd_dict_ptr dict)
: dict_(dict)
hoa_processor(spot::bdd_dict_ptr dict, bool abort_on_error = false)
: dict_(dict), abort_on_error_(abort_on_error)
{
}
@ -131,7 +132,7 @@ public:
break;
if (haut->format_errors(std::cerr))
err = 2;
if (!haut->aut)
if (!haut->aut || (err && abort_on_error_))
error(2, 0, "failed to read automaton from %s",
haut->filename.c_str());
else if (haut->aborted)