536e45b342
This helps recursive implication checks. Also order atomic propositions with strverscmp(). * src/ltlast/formula.hh (formula_ptr_less_than_multop, is_literal, atomic_prop_cmp): New. * src/ltlast/formula.cc (is_literal, atomic_prop_cmp): Implement them. * src/ltlast/multop.cc: Use formula_ptr_less_than_multop. * src/ltltest/isop.test, src/ltltest/ltlfilt.test, src/tgbatest/det.test, src/tgbatest/dstar.test, src/tgbatest/explicit.test, src/tgbatest/explpro2.test, src/tgbatest/explpro3.test, src/tgbatest/explprod.test, src/tgbatest/nondet.test, src/tgbatest/tripprod.test: Adjust tests. * NEWS: Mention the new order.
62 lines
1.7 KiB
Bash
Executable file
62 lines
1.7 KiB
Bash
Executable file
#!/bin/sh
|
|
# Copyright (C) 2008, 2009, 2013 Laboratoire de Recherche et Développement
|
|
# de l'Epita (LRDE).
|
|
# Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de
|
|
# Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
|
|
# Université Pierre et Marie Curie.
|
|
#
|
|
# This file is part of Spot, a model checking library.
|
|
#
|
|
# Spot is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Spot is distributed in the hope that it will be useful, but WITHOUT
|
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
|
# License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
. ./defs
|
|
|
|
set -e
|
|
|
|
cat >input1 <<EOF
|
|
acc = p1;
|
|
s1, s3, "a", p1;
|
|
s1, s2, "b", p1;
|
|
s2, s1, "!a", p1;
|
|
s2, s3, "c",;
|
|
EOF
|
|
|
|
cat >input2 <<EOF
|
|
acc = p2 p3;
|
|
s1, s2, "b", p2;
|
|
s2, s1, "a", p3;
|
|
EOF
|
|
|
|
cat >input3 <<EOF
|
|
acc = p4;
|
|
s1, s2, "a",;
|
|
s1, s3, "b",;
|
|
s3, s2,, p4;
|
|
s2, s3,, p4;
|
|
EOF
|
|
|
|
cat >expected <<EOF
|
|
acc = "p4" "p3" "p2" "p1";
|
|
"s1 * s1 * s1", "s3 * s2 * s2", "a & b", "p2" "p1";
|
|
"s1 * s1 * s1", "s2 * s2 * s2", "a & b", "p2" "p1";
|
|
"s1 * s1 * s1", "s3 * s2 * s3", "a & b", "p2" "p1";
|
|
"s1 * s1 * s1", "s2 * s2 * s3", "b", "p2" "p1";
|
|
"s2 * s2 * s2", "s3 * s1 * s3", "a & c", "p4" "p3";
|
|
"s2 * s2 * s3", "s3 * s1 * s2", "a & c", "p4" "p3";
|
|
EOF
|
|
|
|
run 0 ../tripprod input1 input2 input3 | tee stdout
|
|
diff stdout expected
|
|
rm input1 input2 input3 stdout expected
|