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

Fix a clang++15 warning

Browse source 
* spot/parseaut/parseaut.yy: Move the try-block inside the code of the
constructors, so that they can refer to non-static members.
This commit is contained in:
Alexandre Duret-Lutz 2022-05-17 12:01:11 +02:00
parent 8a628d96bc
commit eecb9af21e
1 changed files with 29 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

52
spot/parseaut/parseaut.yy
View file

@ -2552,45 +2552,51 @@ namespace spot
{
automaton_stream_parser::automaton_stream_parser(const std::string& name,
automaton_parser_options opt)
try
: filename_(name), opts_(opt)
{
if (hoayyopen(name, &scanner_))
throw std::runtime_error("Cannot open file "s + name);
}
catch (...)
{
hoayyclose(scanner_);
throw;
try
{
if (hoayyopen(name, &scanner_))
throw std::runtime_error("Cannot open file "s + name);
}
catch (...)
{
hoayyclose(scanner_);
throw;
}
}
automaton_stream_parser::automaton_stream_parser(int fd,
const std::string& name,
automaton_parser_options opt)
try
: filename_(name), opts_(opt)
{
if (hoayyopen(fd, &scanner_))
throw std::runtime_error("Cannot open file "s + name);
}
catch (...)
{
hoayyclose(scanner_);
throw;
try
{
if (hoayyopen(fd, &scanner_))
throw std::runtime_error("Cannot open file "s + name);
}
catch (...)
{
hoayyclose(scanner_);
throw;
}
}
automaton_stream_parser::automaton_stream_parser(const char* data,
const std::string& filename,
automaton_parser_options opt)
try
: filename_(filename), opts_(opt)
{
hoayystring(data, &scanner_);
}
catch (...)
{
hoayyclose(scanner_);
throw;
try
{
hoayystring(data, &scanner_);
}
catch (...)
{
hoayyclose(scanner_);
throw;
}
}
automaton_stream_parser::~automaton_stream_parser()