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

python: fix error handling while reading automata

Browse source 
* wrap/python/tests/run.in: Make it easier to run python with gdb.
* wrap/python/tests/automata-io.ipynb: Add test case.
* wrap/python/spot.py (spot.automata): Make sure p is defined in all
cases.
* src/hoaparse/hoascan.ll: Make sure we do not close a file that
hasn't been opened.
This commit is contained in:
Alexandre Duret-Lutz 2015-04-13 16:39:19 +02:00
parent a637e23d84
commit ab7ee2c460
4 changed files with 81 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/hoaparse/hoascan.ll
View file

@ -362,8 +362,6 @@ namespace spot
// yy_flex_debug = 1;
if (name == "-")
{
yyin = stdin;
// If the input is a pipe, make the scanner
// interactive so that it does not wait for the input
// buffer to be full to process automata.
@ -372,6 +370,10 @@ namespace spot
throw std::runtime_error("fstat failed");
if (S_ISFIFO(s.st_mode))
want_interactive = true;
// Only set yyin once we know we will use
// it, so that we do not close it otherwise.
yyin = stdin;
}
else
{
@ -395,6 +397,9 @@ namespace spot
yyin = fdopen(fd, "r");
if (!yyin)
throw std::runtime_error("fdopen failed");
// If the input is a pipe, make the scanner
// interactive so that it does not wait for the input
// buffer to be full to process automata.
@ -416,6 +421,10 @@ namespace spot
void
hoayyclose()
{
fclose(yyin);
if (yyin)
{
fclose(yyin);
yyin = NULL;
}
}
}