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

Remove `readsave' and fix line numbers in tgbaparse error messages.

Browse source 
* src/tgbaparse/tgbaparse.yy (line): Fix computation of line number
for error messages when parsing conditions.
* src/tgbatest/readsave.test: Check the syntax position of syntax errors
in the diagnostics.  Use ltl2tgba instead of readsave.
* src/tgbatest/Makefile.am (check_PROGRAMS): Remove readsave.
This commit is contained in:
Alexandre Duret-Lutz 2010-11-06 14:14:18 +01:00
parent a53706c824
commit 7da112344e
5 changed files with 41 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/tgbatest/readsave.test
View file

@ -1,5 +1,5 @@
#!/bin/sh
# Copyright (C) 2009 Laboratoire de Recherche et Développement
# Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement
# de l'Epita (LRDE).
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
@ -34,7 +34,7 @@ s1, "s2", "a&!b", c d;
"state 3", s1,,;
EOF
../readsave input > stdout
../ltl2tgba -b -X input > stdout
cat >expected <<\EOF
acc = "c" "d";
@ -50,7 +50,7 @@ sed 's/"d" "c"/"c" "d"/g;s/!b & a/a \& !b/g' stdout > tmp_ && mv tmp_ stdout
diff stdout expected
mv stdout input
run 0 ../readsave input > stdout
run 0 ../ltl2tgba -b -X input > stdout
# Sort out some possible inversions in the output.
# (The order is not guaranteed by SPOT.)
@ -66,10 +66,32 @@ run 0 ../randtgba -t 1 -n 20 -d 0.2 a b -a 2 0.1 >input
sed 's/"b & a"/"a \& b"/g;s/"a1" "a0"/"a0" "a1"/g' input > tmp_ &&
mv tmp_ input
cat input
run 0 ../readsave input > stdout
run 0 ../ltl2tgba -b -X input > stdout
sed 's/"b & a"/"a \& b"/g;s/"a1" "a0"/"a0" "a1"/g' stdout > tmp_ &&
mv tmp_ stdout
diff input stdout
rm -f input stdout
# Check the position of syntax errors in the diagnostics:
cat >input <<\EOF
acc = "c" "d";
"s1", "s2", "a & !b", "c" "d";
"s2", "state 3", "a &&", "c";
"state 3", "s1", "1)",;
EOF
run 2 ../ltl2tgba -b -X input > stdout 2>stderr
cat stderr
grep input: stderr > stderrfilt
cat >expected <<EOF
input:3.23-22: syntax error, unexpected end of formula
input:3.21-22: missing right operand for "and operator"
input:4.20: syntax error, unexpected closing parenthesis
input:4.20: ignoring trailing garbage
EOF
diff stderrfilt expected