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

eval: adjust to recent parser changes

Browse source 
* spot/parsetl/fmterror.cc, spot/tl/parse.hh: Add an option to display
shifted diagnostics.
* spot/twaalgos/word.cc: Use the new parser interface and the above
option.
This commit is contained in:
Alexandre Duret-Lutz 2016-03-07 21:04:26 +01:00
parent 1c82444376
commit 8360c4e856
3 changed files with 48 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
spot/twaalgos/word.cc
View file

@ -117,15 +117,10 @@ namespace spot
namespace
{
static void word_parse_error(const std::string& word,
size_t i, parse_error_list pel)
size_t i, parsed_formula pf)
{
for (auto& err: pel)
{
err.first.begin.column += i;
err.first.end.column += i;
}
std::ostringstream os;
format_parse_errors(os, word, pel);
pf.format_errors(os, word, i);
throw parse_error(os.str());
}
@ -166,7 +161,6 @@ namespace spot
twa_word_ptr parse_word(const std::string& word, const bdd_dict_ptr& dict)
{
atomic_prop_set aps;
parse_error_list pel;
tl_simplifier tls(dict);
twa_word_ptr tw = make_twa_word(dict);
size_t i = 0;
@ -176,11 +170,11 @@ namespace spot
[&](typename twa_word::seq_t& seq)
{
auto sub = word.substr(i, ind - i);
formula f = spot::parse_infix_boolean(sub, pel);
if (!pel.empty())
word_parse_error(word, i, pel);
atomic_prop_collect(f, &aps);
seq.push_back(tls.as_bdd(f));
auto pf = spot::parse_infix_boolean(sub);
if (!pf.errors.empty())
word_parse_error(word, i, pf);
atomic_prop_collect(pf.f, &aps);
seq.push_back(tls.as_bdd(pf.f));
if (word[ind] == '}')
return true;
// Skip blanks after semi-colon