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

tl: fix handling of f##[0:0]g, and of ##[0:n]g

Browse source 
The first issue was reported by Victor Khomenko.

* spot/tl/formula.cc: Introduce a single-argument
version of sugar_delay().
* spot/parsetl/parsetl.yy: Use it.
* doc/tl/tl.tex, spot/tl/formula.hh: Adjust doc.
* tests/core/ltlfilt.test, tests/core/sugar.test: More tests.
This commit is contained in:
Alexandre Duret-Lutz 2019-05-20 20:59:33 +02:00
parent 66a3b6f7cb
commit 90a88d0b5a
6 changed files with 58 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
spot/tl/formula.hh
View file

@ -1245,9 +1245,25 @@ namespace spot
///
/// The operator does not exist in Spot it is handled as syntactic
/// sugar by the parser. This function is used by the parser to
/// create the equivalent SERE.
/// create the equivalent SERE using PSL operators.
///
/// The rewriting rules depends on the values of a, n, and b.
/// If n≥1 `a ##[n:m] b` is encoded as `a;1[*n-1,m-1];b`.
/// Otherwise:
/// * `a ##[0:0] b` is encoded as `a:b`,
/// * For m>0, `a ##[0:m] b` is encoded as
/// - `a:(1[*0:m];b)` is `a` rejects `[*0]`,
/// - `(a;1[*0:m]):b` is `b` rejects `[*0]`,
/// - `(a:b) | (a;1[*0:m-1];b)` is `a` and `b` accept `[*0]`.
///
/// The left operand can also be missing, in which case
/// `##[n:m] b` is rewritten as `1[*n:m];b`.
/// @{
static formula sugar_delay(const formula& a, const formula& b,
unsigned min, unsigned max);
static formula sugar_delay(const formula& b,
unsigned min, unsigned max);
/// @}
#ifndef SWIG
/// \brief Return the underlying pointer to the formula.