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

tl: extend F[n:m] and G[n:m] to the case of m=$

Browse source 
Suggested by Victor Khomenko.

* spot/tl/formula.cc, spot/tl/formula.hh, spot/parsetl/parsetl.yy:
Implement this.
* NEWS, doc/tl/tl.tex: Document it.
* tests/core/sugar.test, tests/python/ltlparse.py: Add some tests.
This commit is contained in:
Alexandre Duret-Lutz 2019-06-02 14:36:07 +02:00
parent 74786324f4
commit 58389bdb80
7 changed files with 57 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
spot/tl/formula.hh
View file

@ -906,7 +906,8 @@ namespace spot
/// \brief Construct F[n:m]
///
/// F[2:3] = XX(a | Xa)
/// F[2:3]a = XX(a | Xa)
/// F[2:$]a = XXFa
///
/// This syntax is from TSLF; the operator is called next_e![n..m] in PSL.
static formula F(unsigned min_level, unsigned max_level, const formula& f)
@ -916,7 +917,8 @@ namespace spot
/// \brief Construct G[n:m]
///
/// G[2:3] = XX(a & Xa)
/// G[2:3]a = XX(a & Xa)
/// G[2:$]a = XXGa
///
/// This syntax is from TSLF; the operator is called next_a![n..m] in PSL.
static formula G(unsigned min_level, unsigned max_level, const formula& f)
@ -1217,6 +1219,10 @@ namespace spot
///
/// For instance nested_unup_range(op::X, op::Or, 2, 4, a) returns
/// XX(a | X(a | Xa)).
///
/// For `max==unbounded()`, \a uo is repeated \a min times, and
/// its child is set to `F(a)` if \a bo is `op::Or` or to `G(a)`
/// otherwise.
static const formula nested_unop_range(op uo, op bo, unsigned min,
unsigned max, formula f)
{