Add a new length_boolone() function to fix an assert in randpsl.

* src/ltlvisit/length.hh (length_boolone): New function.
* src/ltlvisit/length.cc (length_boolone): Implement it using...
(length_boolone_visitor): ... this new visitor.
* src/ltltest/randltl.cc: Use length_boolone() to check the result
of the random generator, and ignore any formula larger (in
length()) than opt_f.  This fix a bug where the random formula
generator would sometime produce formula larger than requested,
because of the trivial rewriting of {f}[]->e as e|!f.
* src/ltltest/length.cc: Add option -b to call length_boolone().
* src/ltltest/length.test: Test length_boolone().
This commit is contained in:
Alexandre Duret-Lutz 2012-01-06 11:32:44 +01:00
parent c2ab4e781b
commit ed0dd0b48d
5 changed files with 90 additions and 10 deletions

View file

@ -24,6 +24,15 @@
set -e
test `run 0 ../length 'a U Xc'` = 4
test `run 0 ../length 'a&b&c'` = 5
test `run 0 ../length 'a|b|c'` = 5
len()
{
test `run 0 ../length "$1"` = $2
test `run 0 ../length -b "$1"` = $3
}
len 'a U Xc' 4 4
len 'a&b&c' 5 1
len 'a|b|c' 5 1
len '!a|b|!c' 7 1
len '!(!a|b|!c)' 8 1
len '!X(!a|b|!c)' 9 3