Add text I/O for Kripke structures.
* src/kripke/kripkeexplicit.cc, src/kripke/kripkeexplicit.hh, src/kripke/kripkeprint.cc, src/kripke/kripkeprint.hh: New files. * src/kripke/Makefile.am: Add them. * src/kripkeparse/fmterror.cc, src/kripkeparse/kripkeparse.yy, src/kripkeparse/kripkescan.ll, src/kripkeparse/parsedecl.hh, src/kripkeparse/public.hh, src/kripkeparse/scankripke.ll: New files. * src/kripkeparse/Makefile.am: Add them. * src/kripketest/bad_parsing.test, src/kripketest/defs.in, src/kripketest/kripke.test, src/kripketest/origin, src/kripketest/parse_print_test.cc: New files. * src/kripketest/Makefile.am: Add them. * src/Makefile.am (SUBDIRS): Add kripkeparse and kripketest. * README: Document src/kripketest/ and src/kripkeparse/. * configure.ac: Generate src/kripkeparse/Makefile, src/kripketest/Makefile, src/kripketest/defs. * iface/dve2/defs.in (run2): New function. * iface/dve2/dve2check.cc (syntax, main): Add option -gK. * iface/dve2/kripke.test: New file. * iface/dve2/Makefile.am (TESTS): Add kripke.test.
This commit is contained in:
Thomas Badie
Alexandre Duret-Lutz
parent
71d1a4fe25
commit
bb5949f6de
28 changed files with 1824 additions and 7 deletions
|
|
@ -38,7 +38,7 @@ dve2check_LDADD = libspotdve2.la
|
|||
|
||||
check_SCRIPTS = defs
|
||||
|
||||
TESTS = dve2check.test finite.test
|
||||
TESTS = dve2check.test finite.test kripke.test
|
||||
EXTRA_DIST = $(TESTS) beem-peterson.4.dve finite.dve
|
||||
|
||||
distclean-local:
|
||||
|
|
|
|||
|
|
@ -88,4 +88,40 @@ run()
|
|||
test $exitcode = $expected_exitcode || exit 1
|
||||
}
|
||||
|
||||
|
||||
run2()
|
||||
{
|
||||
expected_exitcode=$1
|
||||
shift
|
||||
exitcode=0
|
||||
if test -n "$VALGRIND"; then
|
||||
exec 6>valgrind.err
|
||||
GLIBCPP_FORCE_NEW=1 \
|
||||
../../../libtool --mode=execute \
|
||||
$VALGRIND --tool=memcheck --leak-check=yes --log-fd=6 -q "$@" | grep -v + > log ||
|
||||
exitcode=$?
|
||||
cat valgrind.err 1>&2
|
||||
test -z "`sed 1q valgrind.err`" || exit 50
|
||||
rm -f valgrind.err
|
||||
else
|
||||
"$@" || exitcode=$?
|
||||
fi
|
||||
test $exitcode = $expected_exitcode || exit 1
|
||||
|
||||
exec 6>valgrind.err
|
||||
../../../libtool --mode=execute \
|
||||
$VALGRIND --tool=memcheck --leak-check=yes --log-fd=6 -q $1 log \
|
||||
| grep -v + > log2 ||
|
||||
exitcode=$?
|
||||
cat valgrind.err 1>&2
|
||||
test -z "`sed 1q valgrind.err`" || exit 50
|
||||
rm -f valgrind.err
|
||||
test $exitcode = $expected_exitcode || exit 1
|
||||
|
||||
diff log log2 || exit 42
|
||||
rm -f log log2
|
||||
|
||||
}
|
||||
|
||||
|
||||
set -x
|
||||
|
|
|
|||
|
|
@ -33,6 +33,8 @@
|
|||
#include "misc/timer.hh"
|
||||
#include "misc/memusage.hh"
|
||||
#include <cstring>
|
||||
#include "kripke/kripkeexplicit.hh"
|
||||
#include "kripke/kripkeprint.hh"
|
||||
|
||||
static void
|
||||
syntax(char* prog)
|
||||
|
|
@ -58,6 +60,8 @@ syntax(char* prog)
|
|||
<< std::endl
|
||||
<< " -gm output the model state-space in dot format"
|
||||
<< std::endl
|
||||
<< " -gK output the model state-space in Kripke format"
|
||||
<< std::endl
|
||||
<< " -gp output the product state-space in dot format"
|
||||
<< std::endl
|
||||
<< " -T time the different phases of the execution"
|
||||
|
|
@ -80,7 +84,7 @@ main(int argc, char **argv)
|
|||
|
||||
bool use_timer = false;
|
||||
|
||||
enum { DotFormula, DotModel, DotProduct, EmptinessCheck }
|
||||
enum { DotFormula, DotModel, DotProduct, EmptinessCheck, Kripke }
|
||||
output = EmptinessCheck;
|
||||
bool accepting_run = false;
|
||||
bool expect_counter_example = false;
|
||||
|
|
@ -128,6 +132,9 @@ main(int argc, char **argv)
|
|||
case 'f':
|
||||
output = DotFormula;
|
||||
break;
|
||||
case 'K':
|
||||
output = Kripke;
|
||||
break;
|
||||
default:
|
||||
goto error;
|
||||
}
|
||||
|
|
@ -242,6 +249,14 @@ main(int argc, char **argv)
|
|||
tm.stop("dotty output");
|
||||
goto safe_exit;
|
||||
}
|
||||
if (output == Kripke)
|
||||
{
|
||||
tm.start("kripke output");
|
||||
spot::KripkePrinter p (model, std::cout);
|
||||
p.run();
|
||||
tm.stop("kripke output");
|
||||
goto safe_exit;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
42
iface/dve2/kripke.test
Executable file
42
iface/dve2/kripke.test
Executable file
|
|
@ -0,0 +1,42 @@
|
|||
#! /bin/sh
|
||||
|
||||
# Copyright (C) 2011 Laboratoire de Recherche et Developpement
|
||||
# de l'Epita (LRDE)
|
||||
#
|
||||
# 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 2 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 Spot; see the file COPYING. If not, write to the Free
|
||||
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
# 02111-1307, USA.
|
||||
|
||||
|
||||
|
||||
. ./defs
|
||||
|
||||
divine compile > output 2>&1
|
||||
|
||||
if grep -i ltsmin output; then
|
||||
:
|
||||
else
|
||||
echo "divine not installed, or no ltsmin interface"
|
||||
exit 77
|
||||
fi
|
||||
|
||||
|
||||
set -e
|
||||
|
||||
run 0 ${top_builddir}/iface/dve2/dve2check -gK \
|
||||
${srcdir}/finite.dve 'F("P.a > 5")' | grep -v + > parse
|
||||
run2 0 ${top_builddir}/src/kripketest/parse_print parse
|
||||
rm -f parse
|
||||
Loading…
Add table
Add a link
Reference in a new issue