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

ltlfilt: use error() to report errors.

Browse source 
* lib/error.c, lib/error.h, lib/msvc-inval.c, lib/msvc-inval.h,
lib/msvc-nothrow.c, lib/msvc-nothrow.h, m4/error.m4, m4/msvc-inval.m4,
m4/msvc-nothrow.m4: New files from gnulib
1af55d85d9762a679b4302d5995f05ccd883e956.
* lib/Makefile.am, m4/gnulib-cache.m4, m4/gnulib-comp.m4: Adjust.
* src/bin/ltlfilt.cc: Use error() and error_at_line().
This commit is contained in:
Alexandre Duret-Lutz 2012-08-31 15:28:58 +02:00
parent 8132f91867
commit 90279bd40c
13 changed files with 1043 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/bin/ltlfilt.cc
View file

@ -30,6 +30,7 @@
#include <fstream>
#include <argp.h>
#include "progname.h"
#include "error.h"
#include "misc/_config.h"
#include "misc/hash.hh"
@ -203,10 +204,7 @@ to_int(const char* s)
char* endptr;
int res = strtol(s, &endptr, 10);
if (*endptr)
{
std::cerr << "Failed to parse `" << s << "' as an integer." << std::endl;
exit(1);
}
error(1, 0, "failed to parse '%s' as an integer.", s);
return res;
}
@ -253,8 +251,7 @@ parse_opt(int key, char* arg, struct argp_state* state)
level = arg[0] = '0';
return 0;
}
std::cerr << "Invalid simplification LEVEL: " << arg << "\n";
return 1;
error(1, 0, "invalid simplification level '%s'", arg);
}
break;
case 's':
@ -364,7 +361,7 @@ namespace
if (!quiet)
{
if (filename)
std::cerr << "at " << filename << ":" << linenum << ":\n";
error_at_line(0, 0, filename, linenum, "parse error:");
spot::ltl::format_parse_errors(std::cerr, input, pel);
}
@ -484,30 +481,29 @@ namespace
}
int
process_file(const char* filename)
process_stream(std::istream& is, const char* filename)
{
int error = 0;
int linenum = 0;
std::string line;
// Special case for stdin.
if (filename[0] == '-' && filename[1] == 0)
{
while (std::getline(std::cin, line))
error |= process_formula(line, "stdin", ++linenum);
return error;
}
std::ifstream input(filename);
if (!input)
{
std::cerr << "cannot open " << filename << std::endl;
return 1;
}
while (std::getline(input, line))
while (std::getline(is, line))
error |= process_formula(line, filename, ++linenum);
return error;
}
int
process_file(const char* filename)
{
// Special case for stdin.
if (filename[0] == '-' && filename[1] == 0)
return process_stream(std::cin, filename);
errno = 0;
std::ifstream input(filename);
if (!input)
error(1, errno, "cannot open '%s'", filename);
return process_stream(input, filename);
}
};
}