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

parsetl: change the interface to return a parsed_formula

Browse source 
This gets the interface of all the functions parsing formula in line
with the interface of the automaton parser: both return a "parsed_*"
object (parsed_formula or parsed_automaton) that contains the said
object and its list of errors.  Doing so avoid having to declare the
parse_error_list in advance.

* spot/tl/parse.hh, spot/parsetl/parsetl.yy: Do the change.
* spot/parsetl/fmterror.cc: Adjust the error printer.
* NEWS: Document it.
* bin/common_finput.cc, bin/common_finput.hh, bin/ltlcross.cc,
bin/ltldo.cc, bin/ltlfilt.cc, doc/org/tut01.org, doc/org/tut02.org,
doc/org/tut10.org, doc/org/tut20.org, python/ajax/spotcgi.in,
python/spot/impl.i, spot/parseaut/parseaut.yy, tests/core/checkpsl.cc,
tests/core/checkta.cc, tests/core/consterm.cc, tests/core/emptchk.cc,
tests/core/equalsf.cc, tests/core/ikwiad.cc, tests/core/kind.cc,
tests/core/length.cc, tests/core/ltlprod.cc, tests/core/ltlrel.cc,
tests/core/randtgba.cc, tests/core/readltl.cc, tests/core/reduc.cc,
tests/core/safra.cc, tests/core/syntimpl.cc, tests/core/tostring.cc,
tests/ltsmin/modelcheck.cc, tests/python/alarm.py,
tests/python/interdep.py, tests/python/ltl2tgba.py,
tests/python/ltlparse.py: Adjust all uses.
This commit is contained in:
Alexandre Duret-Lutz 2016-02-17 19:39:43 +01:00
parent cf4f58c34b
commit 22f442f758
37 changed files with 359 additions and 374 deletions
Download patch file Download diff file Expand all files Collapse all files

21
bin/common_finput.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2012, 2013, 2014, 2015 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
// Copyright (C) 2012, 2013, 2014, 2015, 2016 Laboratoire de Recherche
// et Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
@ -76,14 +76,14 @@ parse_opt_finput(int key, char* arg, struct argp_state*)
return 0;
}
spot::formula
parse_formula(const std::string& s, spot::parse_error_list& pel)
spot::parsed_formula
parse_formula(const std::string& s)
{
if (lbt_input)
return spot::parse_prefix_ltl(s, pel);
return spot::parse_prefix_ltl(s);
else
return spot::parse_infix_psl
(s, pel, spot::default_environment::instance(), false, lenient);
(s, spot::default_environment::instance(), false, lenient);
}
job_processor::job_processor()
@ -108,17 +108,16 @@ job_processor::process_string(const std::string& input,
const char* filename,
int linenum)
{
spot::parse_error_list pel;
auto f = parse_formula(input, pel);
auto pf = parse_formula(input);
if (!f || !pel.empty())
if (!pf.f || !pf.errors.empty())
{
if (filename)
error_at_line(0, 0, filename, linenum, "parse error:");
spot::format_parse_errors(std::cerr, input, pel);
pf.format_errors(std::cerr);
return 1;
}
return process_formula(f, filename, linenum);
return process_formula(pf.f, filename, linenum);
}
int

5
bin/common_finput.hh
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2012, 2013, 2015 Laboratoire de Recherche et
// Copyright (C) 2012, 2013, 2015, 2016 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
@ -44,8 +44,7 @@ extern const struct argp finput_argp;
int parse_opt_finput(int key, char* arg, struct argp_state* state);
spot::formula
parse_formula(const std::string& s, spot::parse_error_list& error_list);
spot::parsed_formula parse_formula(const std::string& s);
class job_processor

9
bin/ltlcross.cc
View file

@ -837,16 +837,15 @@ namespace
const char* filename,
int linenum)
{
spot::parse_error_list pel;
spot::formula f = parse_formula(input, pel);
if (!f || !pel.empty())
auto pf = parse_formula(input);
if (!pf.f || !pf.errors.empty())
{
if (filename)
error_at_line(0, 0, filename, linenum, "parse error:");
spot::format_parse_errors(std::cerr, input, pel);
pf.format_errors(std::cerr);
return 1;
}
auto f = pf.f;
int res = process_formula(f, filename, linenum);

9
bin/ltldo.cc
View file

@ -237,19 +237,18 @@ namespace
const char* filename,
int linenum)
{
spot::parse_error_list pel;
spot::formula f = parse_formula(input, pel);
spot::parsed_formula pf = parse_formula(input);
if (!f || !pel.empty())
if (!pf.f || !pf.errors.empty())
{
if (filename)
error_at_line(0, 0, filename, linenum, "parse error:");
spot::format_parse_errors(std::cerr, input, pel);
pf.format_errors(std::cerr);
return 1;
}
inputf = input;
process_formula(f, filename, linenum);
process_formula(pf.f, filename, linenum);
return 0;
}

18
bin/ltlfilt.cc
View file

@ -288,11 +288,10 @@ static std::string unabbreviate;
static spot::formula
parse_formula_arg(const std::string& input)
{
spot::parse_error_list pel;
spot::formula f = parse_formula(input, pel);
if (spot::format_parse_errors(std::cerr, input, pel))
spot::parsed_formula pf = parse_formula(input);
if (pf.format_errors(std::cerr))
error(2, 0, "parse error when parsing an argument");
return f;
return pf.f;
}
static int
@ -482,20 +481,19 @@ namespace
process_string(const std::string& input,
const char* filename = nullptr, int linenum = 0)
{
spot::parse_error_list pel;
spot::formula f = parse_formula(input, pel);
spot::parsed_formula pf = parse_formula(input);
if (!f || pel.size() > 0)
if (!pf.f || !pf.errors.empty())
{
if (!ignore_errors)
{
if (filename)
error_at_line(0, 0, filename, linenum, "parse error:");
spot::format_parse_errors(std::cerr, input, pel);
pf.format_errors(std::cerr);
}
if (error_style == skip_errors)
std::cout << input << std::endl;
std::cout << input << '\n';
else
assert(error_style == drop_errors);
check_cout();
@ -503,7 +501,7 @@ namespace
}
try
{
return process_formula(f, filename, linenum);
return process_formula(pf.f, filename, linenum);
}
catch (const std::runtime_error& e)
{