* src/ltlparse/ltlscan.ll: Pass yyleng to the std::string constructor,

so it doesn't have to compute it.
* src/tgbaparse/tgbascan.ll: Likewise.
(YY_USER_INIT, current_file): Remove, it is too costly to use
yy::Location::filename in the current implementation
of yy::Location (this attribute is duplicated for each token).
Leaving it empty divides the parsing time by 3.
* src/tgbaparse/fmterror.cc, src/tgbaparse/public.hh
(format_tgba_parse_errors): Take the filename as argument.
* src/tgbatest/explprod.cc, src/tgbatest/ltl2tgba.cc,
src/tgbatest/mixprod.cc, src/tgbatest/powerset.cc,
src/tgbatest/readsave.cc, src/tgbatest/reductgba.cc,
src/tgbatest/tgbaread.cc, src/tgbatest/tripprod.cc,
iface/gspn/dottyssp.cc, iface/gspn/ltlgspn.cc: Adjust calls
to format_tgba_parse_errors.
This commit is contained in:
Alexandre Duret-Lutz 2004-12-16 12:33:37 +00:00
parent 704f237a22
commit 0efca0f644
15 changed files with 44 additions and 31 deletions

View file

@ -280,7 +280,8 @@ main(int argc, char** argv)
spot::tgba_parse_error_list pel;
system = spot::tgba_parse(argv[formula_index] + 2,
pel, dict, env, debug_opt);
if (spot::format_tgba_parse_errors(std::cerr, pel))
if (spot::format_tgba_parse_errors(std::cerr,
argv[formula_index] + 2, pel))
return 2;
system->merge_transitions();
std::clog << argv[formula_index] + 2 << " read" << std::endl;
@ -528,7 +529,7 @@ main(int argc, char** argv)
spot::tgba_parse_error_list pel;
spot::tgba_explicit* e;
to_free = a = e = spot::tgba_parse(input, pel, dict, env, debug_opt);
if (spot::format_tgba_parse_errors(std::cerr, pel))
if (spot::format_tgba_parse_errors(std::cerr, input, pel))
{
delete to_free;
delete dict;