Add a constant_term() visitor to decide whether #e is accepted.

* src/ltlvisit/Makefile.am: Add consterm.cc and consterm.hh.
* src/ltlvisit/consterm.hh, src/ltlvisit/consterm.cc: New files.
* src/ltltest/Makefile.am: Add consterm.cc and consterm.test.
* src/ltltest/consterm.cc, src/ltltest/consterm.test: New files.
This commit is contained in:
Alexandre Duret-Lutz 2010-01-11 16:01:38 +01:00
parent 2d1aa0a5a0
commit 97b7211bb7
6 changed files with 307 additions and 1 deletions

View file

@ -28,6 +28,7 @@ LDADD = ../libspot.la
check_SCRIPTS = defs
# Keep this sorted alphabetically.
check_PROGRAMS = \
consterm \
equals \
length \
ltl2dot \
@ -47,6 +48,7 @@ noinst_PROGRAMS = \
genltl \
randltl
consterm_SOURCES = consterm.cc
equals_SOURCES = equals.cc
genltl_SOURCES = genltl.cc
length_SOURCES = length.cc
@ -86,6 +88,7 @@ TESTS = \
tunabbrev.test \
nenoform.test \
tunenoform.test \
consterm.test \
syntimpl.test \
reduc.test \
reduccmp.test

57
src/ltltest/consterm.cc Normal file
View file

@ -0,0 +1,57 @@
// Copyright (C) 2010 Laboratoire de Recherche et Developement 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.
#include <iostream>
#include <cassert>
#include <cstdlib>
#include "ltlparse/public.hh"
#include "ltlvisit/consterm.hh"
#include "ltlast/allnodes.hh"
void
syntax(char *prog)
{
std::cerr << prog << " formula" << std::endl;
exit(2);
}
int
main(int argc, char **argv)
{
if (argc != 2)
syntax(argv[0]);
spot::ltl::parse_error_list p1;
spot::ltl::formula* f1 = spot::ltl::parse(argv[1], p1);
if (spot::ltl::format_parse_errors(std::cerr, argv[1], p1))
return 2;
bool b = spot::ltl::constant_term_as_bool(f1);
std::cout << b << std::endl;
f1->destroy();
assert(spot::ltl::atomic_prop::instance_count() == 0);
assert(spot::ltl::unop::instance_count() == 0);
assert(spot::ltl::binop::instance_count() == 0);
assert(spot::ltl::multop::instance_count() == 0);
return b;
}

40
src/ltltest/consterm.test Executable file
View file

@ -0,0 +1,40 @@
#! /bin/sh
# Copyright (C) 2010 Laboratoire de Recherche et Developement to
# 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.
# Check for the constant_term visitor
. ./defs || exit 1
set -e
run 0 ../consterm 'a'
run 0 ../consterm '1'
run 0 ../consterm '0'
run 1 ../consterm '#e'
run 1 ../consterm 'a*'
run 1 ../consterm '0*'
run 0 ../consterm '!#e'
run 0 ../consterm '((a U b) + c)'
run 1 ../consterm '((a U b) + #e)'
run 0 ../consterm '((a U b) + #e) & e'
run 1 ../consterm '((a U b) + #e) & #e'
run 1 ../consterm '((a U b) + #e) & (a* + b)'