* src/ltlvisit/tostring.cc (to_spin_string_visitor,
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:
parent
6f4ab3af6c
commit
35ef738ff9
10 changed files with 72 additions and 43 deletions
|
|
@ -41,16 +41,16 @@ EOF
|
|||
|
||||
cat >expected <<EOF
|
||||
acc = "p1" "p2" "p3";
|
||||
"s1 * s1", "s3 * s2", "(a & b)", "p1" "p2";
|
||||
"s1 * s1", "s3 * s2", "a & b", "p1" "p2";
|
||||
"s1 * s1", "s2 * s2", "b", "p1" "p2";
|
||||
"s2 * s2", "s3 * s1", "(a & c)", "p1" "p3";
|
||||
"s2 * s2", "s3 * s1", "a & c", "p1" "p3";
|
||||
EOF
|
||||
|
||||
run 0 ./explprod input1 input2 > stdout
|
||||
# Sort out some possible inversions in the output.
|
||||
# (The order is not guaranteed by SPOT.)
|
||||
perl -pe 's/("\w+") ("\w+")(?: ("\w+"))?/@{[sort $1, $2, $3]}/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
|
||||
|
||||
cat stdout
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue