Add functions to compute the kind of a formula (LTL, PSL, Boolean...)

* src/ltlvisit/kind.hh, src/ltlvisit/kind.cc: New files.
* src/ltlvisit/Makefile.am: Add them.
* src/ltltest/kind.test, src/ltltest/kind.cc: New files.
* src/ltltest/Makefile.am: Add them.

src/ltltest/.gitignore

@@ -22,3 +22,5 @@ randltl
 reductau
 reductaustr
 genltl
+kind
+consterm

src/ltltest/Makefile.am

@@ -30,6 +30,7 @@ check_SCRIPTS = defs
 check_PROGRAMS = \
   consterm \
   equals \
+  kind \
   length \
   ltl2dot \
   ltl2text \
@@ -51,6 +52,7 @@ noinst_PROGRAMS = \
 consterm_SOURCES = consterm.cc
 equals_SOURCES = equals.cc
 genltl_SOURCES = genltl.cc
+kind_SOURCES = kind.cc
 length_SOURCES = length.cc
 ltl2dot_SOURCES = readltl.cc
 ltl2dot_CPPFLAGS = $(AM_CPPFLAGS) -DDOTTY
@@ -89,6 +91,7 @@ TESTS = \
   nenoform.test \
   tunenoform.test \
   consterm.test \
+  kind.test \
   syntimpl.test \
   reduc.test \
   reduccmp.test

src/ltltest/kind.cc

@@ -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/kind.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;
+
+  unsigned k = spot::ltl::kind_of(f1);
+  spot::ltl::print_kind(std::cout, k, true) << " = ";
+  spot::ltl::print_kind(std::cout, k, false) << 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 0;
+}

src/ltltest/kind.test

@@ -0,0 +1,72 @@
+#! /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
+
+check()
+{
+    run 0 ../kind "$1" >out
+    read word rest <out
+    test "$word" = "$2"
+}
+
+check 'a'         'B&!xfLEP'
+check 'a<->b'     'BxfLEP'
+check '!a'        'B&!xfLEP'
+check '!(a|b)'    'B&xfLEP'
+check 'a U b'     '&!xfLP'
+check 'a U Fb'    '&!xLP'
+check 'Ga U b'    '&!xLP'
+check 'a W b'     '&!xfLP'
+check 'a M b'     '&!xfLP'
+check 'a R b'     '&!xfLP'
+check '{a}|->!Xb' '&fP'
+check '{a}|->X!b' '&!fP'
+check '{a}|->!Gb' '&xP'
+check '{a}|->F!b' '&!xP'
+
+run 0 ../consterm '1'
+run 0 ../consterm '0'
+run 1 ../consterm '[*0]'
+run 1 ../consterm 'a*'
+run 1 ../consterm '0*'
+run 1 ../consterm 'a[*0]'
+run 1 ../consterm 'a[*0..]'
+run 1 ../consterm 'a[*0..3]'
+run 0 ../consterm 'a[*1..3]'
+run 0 ../consterm 'a[*3]'
+run 1 ../consterm 'a[*..4][*3]'
+run 0 ../consterm 'a[*1..4][*3]'
+run 1 ../consterm 'a[*1..4][*0..3]'
+run 0 ../consterm '((a ; b) + c)'
+run 1 ../consterm '((a ; b) + [*0])'
+run 0 ../consterm '((a ; b) + [*0]) & e'
+run 1 ../consterm '((a ; b) + [*0]) & [*0]'
+run 1 ../consterm '((a ; b) + [*0]) & (a* + b)'
+run 1 ../consterm '{{a ; b} + {[*0]}} & {a* + b}'  # test braces
+run 1 ../consterm '(a + [*0]);(b + [*0]);(c + [*0])'
+run 0 ../consterm '(a + [*0]);(b + e);(c + [*0])'
+run 1 ../consterm '(a + [*0]);(b + e)*;(c + [*0])'