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

* src/ltlvisit/tostring.cc (to_spin_string_visitor,

Browse source 
to_string_visitor): Do not parenthesize the top-level formula.
* tgbatest/explicit.test, tgbatest/explpro2.test,
tgbatest/explpro3.test, tgbatest/explprod.test,
tgbatest/readsave.test, tgbatest/tgbaread.test,
tgbatest/tripprod.test: Adjust expected output.
* sanity/style.test: Fix regexes to catch an error seen in
tostring.cc.
This commit is contained in:
Alexandre Duret-Lutz 2004-05-14 11:01:14 +00:00
parent 6f4ab3af6c
commit 35ef738ff9
10 changed files with 72 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/tgbatest/tripprod.test
View file

@ -49,12 +49,12 @@ EOF
cat >expected <<EOF
acc = "p1" "p2" "p3" "p4";
"s1 * s1 * s1", "s3 * s2 * s2", "(a & b)", "p1" "p2";
"s1 * s1 * s1", "s2 * s2 * s2", "(a & b)", "p1" "p2";
"s1 * s1 * s1", "s3 * s2 * s3", "(a & b)", "p1" "p2";
"s1 * s1 * s1", "s3 * s2 * s2", "a & b", "p1" "p2";
"s1 * s1 * s1", "s2 * s2 * s2", "a & b", "p1" "p2";
"s1 * s1 * s1", "s3 * s2 * s3", "a & b", "p1" "p2";
"s1 * s1 * s1", "s2 * s2 * s3", "b", "p1" "p2";
"s2 * s2 * s2", "s3 * s1 * s3", "(a & c)", "p3" "p4";
"s2 * s2 * s3", "s3 * s1 * s2", "(a & c)", "p3" "p4";
"s2 * s2 * s2", "s3 * s1 * s3", "a & c", "p3" "p4";
"s2 * s2 * s3", "s3 * s1 * s2", "a & c", "p3" "p4";
EOF
run 0 ./tripprod input1 input2 input3 > stdout
@ -62,7 +62,7 @@ run 0 ./tripprod input1 input2 input3 > stdout
# Sort out some possible inversions in the output.
# (The order is not guaranteed by SPOT.)
perl -pe 's/("\w+") ("\w+")(?: ("\w+"))?(?: ("\w+"))?/@{[sort $1,$2,$3,$4]}/g;
s/\(c & a\)/(a & c)/g;s/\(b & a\)/(a & b)/g' \
s/c & a/a & c/g;s/b & a/a & b/g' \
stdout > tmp_ &&
mv tmp_ stdout