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

Diagnose reversed ranges like [=2..1], [->..0] or [*8..4].

Browse source 
* src/ltlparse/ltlparse.yy: Diagnose them.
* src/ltltest/parseerr.test: Add tests.
This commit is contained in:
Alexandre Duret-Lutz 2011-12-02 12:27:44 +01:00
parent ec9a3f96cb
commit 2f9f274a5f
2 changed files with 36 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/ltlparse/ltlparse.yy
View file

@ -376,12 +376,31 @@ rationalexp: booleanatom
| rationalexp OP_FUSION error
{ missing_right_binop($$, $1, @2, "fusion operator"); }
| rationalexp starargs
{ $$ = bunop::instance(bunop::Star, $1, $2.min, $2.max); }
{
if ($2.max < $2.min)
{
error_list.push_back(parse_error(@2, "reversed range"));
std::swap($2.max, $2.min);
}
$$ = bunop::instance(bunop::Star, $1, $2.min, $2.max);
}
| starargs
{ $$ = bunop::instance(bunop::Star, constant::true_instance(),
$1.min, $1.max); }
{
if ($1.max < $1.min)
{
error_list.push_back(parse_error(@1, "reversed range"));
std::swap($1.max, $1.min);
}
$$ = bunop::instance(bunop::Star, constant::true_instance(),
$1.min, $1.max);
}
| rationalexp equalargs
{
if ($2.max < $2.min)
{
error_list.push_back(parse_error(@2, "reversed range"));
std::swap($2.max, $2.min);
}
if ($1->is_boolean())
{
$$ = bunop::instance(bunop::Equal, $1, $2.min, $2.max);
@ -399,6 +418,11 @@ rationalexp: booleanatom
}
| rationalexp gotoargs
{
if ($2.max < $2.min)
{
error_list.push_back(parse_error(@2, "reversed range"));
std::swap($2.max, $2.min);
}
if ($1->is_boolean())
{
$$ = bunop::instance(bunop::Goto, $1, $2.min, $2.max);