genltl: fix %F for --r-left and --r-right

Fixes #247.

* bin/genltl.cc: Here.
* tests/core/genltl.test: Make sure %F always return a correct pattern
name..
* NEWS: Mention the bug.
This commit is contained in:
Alexandre Duret-Lutz 2017-03-22 14:06:02 +01:00
parent 1596f0ed75
commit cdf699ff23
3 changed files with 13 additions and 2 deletions

3
NEWS
View file

@ -5,6 +5,9 @@ New in spot 2.3.2.dev (not yet released)
- In "lenient" mode the parser would fail to recover from - In "lenient" mode the parser would fail to recover from
a missing closing brace. a missing closing brace.
- The output of 'genltl --r-left=1 --r-right=1 --format=%F'
had typos.
New in spot 2.3.2 (2017-03-15) New in spot 2.3.2 (2017-03-15)
Tools: Tools:

View file

@ -223,8 +223,8 @@ const char* const class_name[LAST_CLASS - FIRST_CLASS] =
"or-fg", "or-fg",
"or-g", "or-g",
"or-gf", "or-gf",
"or-r-left", "r-left",
"or-r-right", "r-right",
"rv-counter", "rv-counter",
"rv-counter-carry", "rv-counter-carry",
"rv-counter-carry-linear", "rv-counter-carry-linear",

View file

@ -21,6 +21,14 @@
. ./defs . ./defs
set -e set -e
# Make sure the name of each pattern is correctly output by %F.
opts=`genltl --help | sed -n '/=RANGE/{
s/^ *//
s/[=[].*/=1/p
}'`
res=`genltl $opts --format="--%F=%L"`
test "$opts" = "$res"
run 0 genltl --dac=1..5 --eh=1..5 --pos --neg --format="%F:%L %f" >output run 0 genltl --dac=1..5 --eh=1..5 --pos --neg --format="%F:%L %f" >output
cat >expected <<EOF cat >expected <<EOF
dac-patterns:1 G!p0 dac-patterns:1 G!p0