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

Add support for the {SERE}! PSL operator.

Browse source 
* src/ltlparse/ltlscan.ll: Recognize }!.  Also remove
five duplicate rules.
* src/ltlparse/ltlparse.yy: Build {r}<>->1 when parsing {r}!.
* src/ltlvisit/tostring.cc: Print {r}! instead of {r}<>->1.
* src/ltltest/tostring.test, src/ltltest/equals.test:
Add more tests.
This commit is contained in:
Alexandre Duret-Lutz 2011-02-17 18:47:21 +01:00
parent c48b9bcfb5
commit fdd73d5123
5 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/ltlvisit/tostring.cc
View file

@ -165,6 +165,12 @@ namespace spot
top_level_ = top_level;
break;
case binop::EConcat:
if (bo->second() == constant::true_instance())
{
os_ << "}!";
in_ratexp_ = false;
goto second_done;
}
os_ << "} <>-> ";
in_ratexp_ = false;
top_level_ = false;
@ -177,6 +183,7 @@ namespace spot
}
bo->second()->accept(*this);
second_done:
if (!top_level)
closep();
}
@ -255,7 +262,6 @@ namespace spot
break;
}
top_level_ = false;
if (need_parent || full_parent_)
openp();
uo->child()->accept(*this);
@ -416,6 +422,11 @@ namespace spot
top_level_ = true;
os_ << "{";
bo->first()->accept(*this);
if (bo->second() == constant::true_instance())
{
os_ << "}!";
break;
}
os_ << "} <>-> ";
top_level_ = false;
bo->second()->accept(*this);