Commit 6ded5e75 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz

merge ltlvisit/ ltlast/ ltlenv/ into a single tl/ directory

The ltl prefix does not make a lot of sens anymore (since we
support psl as well).  ltlast/ and ltlenv/ were almost empty.
And ltlvisit/ did not contain any visitor anymore.

* src/ltlvisit/, src/ltlast/, src/ltlenv/: Merge into...
* src/tl/: ...this.
* NEWS: Mention the change.
* README, bench/stutter/stutter_invariance_formulas.cc,
bench/stutter/stutter_invariance_randomgraph.cc, configure.ac,
doc/org/tut01.org, doc/org/tut02.org, doc/org/tut10.org, doc/tl/tl.tex,
iface/ltsmin/ltsmin.hh, iface/ltsmin/modelcheck.cc, src/Makefile.am,
src/bin/autfilt.cc, src/bin/common_output.cc, src/bin/common_output.hh,
src/bin/common_r.hh, src/bin/common_trans.cc, src/bin/genltl.cc,
src/bin/ltl2tgba.cc, src/bin/ltl2tgta.cc, src/bin/ltlcross.cc,
src/bin/ltldo.cc, src/bin/ltlfilt.cc, src/bin/ltlgrind.cc,
src/bin/randltl.cc, src/kripke/kripkeexplicit.hh,
src/kripkeparse/public.hh, src/parseaut/public.hh, src/priv/accmap.hh,
src/ta/taexplicit.hh, src/ta/tgtaexplicit.hh, src/tests/equalsf.cc,
src/tests/ikwiad.cc, src/tests/length.cc, src/tests/ltlrel.cc,
src/tests/randtgba.cc, src/tests/readltl.cc, src/tests/reduc.cc,
src/tests/syntimpl.cc, src/tests/taatgba.cc, src/tests/tostring.cc,
src/tests/twagraph.cc, src/twa/acc.hh, src/twa/bdddict.cc,
src/twa/bdddict.hh, src/twa/bddprint.cc, src/twa/taatgba.cc,
src/twa/taatgba.hh, src/twa/twa.hh, src/twa/twagraph.cc,
src/twa/twagraph.hh, src/twa/twasafracomplement.cc,
src/twaalgos/compsusp.cc, src/twaalgos/compsusp.hh,
src/twaalgos/dtgbasat.cc, src/twaalgos/hoa.cc,
src/twaalgos/isweakscc.cc, src/twaalgos/lbtt.cc,
src/twaalgos/ltl2taa.cc, src/twaalgos/ltl2taa.hh,
src/twaalgos/ltl2tgba_fm.cc, src/twaalgos/ltl2tgba_fm.hh,
src/twaalgos/minimize.hh, src/twaalgos/neverclaim.cc,
src/twaalgos/randomgraph.hh, src/twaalgos/relabel.hh,
src/twaalgos/remprop.hh, src/twaalgos/stats.cc, src/twaalgos/stutter.cc,
src/twaalgos/translate.hh, wrap/python/spot_impl.i,
src/ltlparse/ltlparse.yy, src/ltlparse/public.hh: Adjust.
parent 3e10dba9
......@@ -41,6 +41,11 @@ New in spot 1.99.3a (not yet released)
more friendly, and several algorithms that spanned a few pages
have been reduced to a few lines.
* The source directories ltlast/, ltlenv/, and ltlvisit/, have been
merged into a single tl/ directory (for temporal logic). This is
motivated by the fact that these formulas are not restricted to
LTL, and by the fact that we no longuer use the "visitor" pattern.
New in spot 1.99.3 (2015-08-26)
* The CGI script for LTL translation offers a HOA download link
......
......@@ -140,10 +140,8 @@ src/ Sources for libspot.
graph/ Graph representations.
kripke/ Kripke Structure interface.
kripkeparse/ Parser for explicit Kripke.
ltlast/ LTL abstract syntax tree (including nodes for ELTL).
ltlenv/ LTL environments.
tl/ Temporal Logic formulas and algorithms.
ltlparse/ Parser for LTL formulae.
ltlvisit/ Visitors of LTL formulae.
misc/ Miscellaneous support files.
parseaut/ Parser for automata in multiple formats.
priv/ Private algorithms, used internally but not exported.
......
......@@ -25,8 +25,7 @@
#include "twaalgos/stutter.hh"
#include "twaalgos/dupexp.hh"
#include "twaalgos/stats.hh"
#include "ltlvisit/apcollect.hh"
#include "ltlvisit/length.hh"
#include "tl/apcollect.hh"
#include "misc/timer.hh"
#include <argp.h>
......
......@@ -18,7 +18,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "misc/timer.hh"
#include "ltlvisit/apcollect.hh"
#include "tl/apcollect.hh"
#include "twaalgos/dtgbacomp.hh"
#include "twaalgos/randomgraph.hh"
#include "twaalgos/dot.hh"
......
......@@ -200,28 +200,26 @@ AC_CONFIG_FILES([
lib/Makefile
src/bin/Makefile
src/bin/man/Makefile
src/kripke/Makefile
src/graph/Makefile
src/parseaut/Makefile
src/ltlast/Makefile
src/ltlenv/Makefile
src/ltlparse/Makefile
src/kripke/Makefile
src/kripkeparse/Makefile
src/ltlvisit/Makefile
src/ltlparse/Makefile
src/Makefile
src/misc/Makefile
src/parseaut/Makefile
src/priv/Makefile
src/sanity/Makefile
src/twaalgos/gtec/Makefile
src/twaalgos/Makefile
src/twa/Makefile
src/taalgos/Makefile
src/ta/Makefile
src/tests/defs
src/tests/Makefile
src/tl/Makefile
src/twaalgos/gtec/Makefile
src/twaalgos/Makefile
src/twa/Makefile
wrap/Makefile
wrap/python/Makefile
wrap/python/ajax/Makefile
wrap/python/Makefile
wrap/python/tests/Makefile
tools/x-to-1
])
......
......@@ -67,7 +67,7 @@ exceptions.
#+BEGIN_SRC C++ :results verbatim :exports both
#include <iostream>
#include "ltlparse/public.hh"
#include "ltlvisit/print.hh"
#include "tl/print.hh"
int main()
{
......@@ -105,7 +105,7 @@ Here is how to call the infix parser explicitly,:
#include <string>
#include <iostream>
#include "ltlparse/public.hh"
#include "ltlvisit/print.hh"
#include "tl/print.hh"
int main()
{
......@@ -147,7 +147,7 @@ with the "fixed" formula if you wish. Here is an example:
#include <string>
#include <iostream>
#include "ltlparse/public.hh"
#include "ltlvisit/print.hh"
#include "tl/print.hh"
int main()
{
......@@ -189,7 +189,7 @@ of =parse_infix_psl()=.
#include <string>
#include <iostream>
#include "ltlparse/public.hh"
#include "ltlvisit/print.hh"
#include "tl/print.hh"
int main()
{
......@@ -231,7 +231,7 @@ For instance, let's see what happens if a PSL formulas is passed to
#include <string>
#include <iostream>
#include "ltlparse/public.hh"
#include "ltlvisit/print.hh"
#include "tl/print.hh"
int main()
{
......@@ -261,7 +261,7 @@ The first is to simply diagnose non-LTL formulas.
#include <string>
#include <iostream>
#include "ltlparse/public.hh"
#include "ltlvisit/print.hh"
#include "tl/print.hh"
int main()
{
......@@ -290,8 +290,8 @@ prepared to reject the formula any way. In our example, we are lucky
#include <string>
#include <iostream>
#include "ltlparse/public.hh"
#include "ltlvisit/print.hh"
#include "ltlvisit/simplify.hh"
#include "tl/print.hh"
#include "tl/simplify.hh"
int main()
{
......
......@@ -81,8 +81,8 @@ destructor.
#include <string>
#include <iostream>
#include "ltlparse/public.hh"
#include "ltlvisit/print.hh"
#include "ltlvisit/relabel.hh"
#include "tl/print.hh"
#include "tl/relabel.hh"
int main()
{
......
......@@ -130,7 +130,7 @@ never claim is done via the =print_never_claim= function.
#include <string>
#include <iostream>
#include "ltlparse/public.hh"
#include "ltlvisit/print.hh"
#include "tl/print.hh"
#include "twaalgos/translate.hh"
#include "twaalgos/neverclaim.hh"
......
......@@ -1287,7 +1287,7 @@ you plan to abbreviate many formulas sharing identical subformulas.
The LTL rewritings described in the next three sections are all
implemented in the `\verb|ltl_simplifier|' class defined in
\texttt{spot/ltlvisit/simplify.hh}. This class implements several
\texttt{spot/tl/simplify.hh}. This class implements several
caches in order to quickly rewrite formulas that have already been
rewritten previously. For this reason, it is suggested that you reuse
your instance of `\verb|ltl_simplifier|' as much as possible. If you
......
......@@ -20,7 +20,7 @@
#pragma once
#include "kripke/kripke.hh"
#include "ltlvisit/apcollect.hh"
#include "tl/apcollect.hh"
namespace spot
{
......
......@@ -19,7 +19,7 @@
#include "ltsmin.hh"
#include "twaalgos/dot.hh"
#include "ltlenv/defaultenv.hh"
#include "tl/defaultenv.hh"
#include "ltlparse/public.hh"
#include "twaalgos/translate.hh"
#include "twaalgos/emptiness.hh"
......
......@@ -25,25 +25,22 @@ AUTOMAKE_OPTIONS = subdir-objects
# List directories in the order they must be built. Keep tests at the
# end, after building '.' (since the current directory contains
# libspot.la needed by the tests)
SUBDIRS = misc priv ltlenv ltlast ltlvisit ltlparse graph twa \
twaalgos ta taalgos kripke kripkeparse parseaut . bin tests \
sanity
SUBDIRS = misc priv tl ltlparse graph twa twaalgos ta taalgos kripke \
kripkeparse parseaut . bin tests sanity
lib_LTLIBRARIES = libspot.la
libspot_la_SOURCES =
libspot_la_LDFLAGS = $(BUDDY_LDFLAGS) -no-undefined
libspot_la_LIBADD = \
parseaut/libparseaut.la \
kripke/libkripke.la \
kripkeparse/libkripkeparse.la \
ltlast/libltlast.la \
ltlenv/libltlenv.la \
ltlparse/libltlparse.la \
ltlvisit/libltlvisit.la \
misc/libmisc.la \
parseaut/libparseaut.la \
priv/libpriv.la \
taalgos/libtaalgos.la \
ta/libta.la \
tl/libtl.la \
twaalgos/libtwaalgos.la \
twa/libtwa.la \
../lib/libgnu.la
......
......@@ -44,7 +44,7 @@
#include "misc/timer.hh"
#include "misc/random.hh"
#include "parseaut/public.hh"
#include "ltlvisit/exclusive.hh"
#include "tl/exclusive.hh"
#include "twaalgos/remprop.hh"
#include "twaalgos/randomize.hh"
#include "twaalgos/are_isomorphic.hh"
......
......@@ -21,7 +21,7 @@
#include "common_output.hh"
#include <iostream>
#include <sstream>
#include "ltlvisit/print.hh"
#include "tl/print.hh"
#include "misc/formater.hh"
#include "misc/escape.hh"
#include "common_cout.hh"
......
......@@ -24,7 +24,7 @@
#include <argp.h>
#include <map>
#include <memory>
#include "ltlast/formula.hh"
#include "tl/formula.hh"
#include "twaalgos/stats.hh"
#include "common_output.hh"
#include "common_file.hh"
......
......@@ -20,7 +20,7 @@
#pragma once
#include "common_sys.hh"
#include "ltlvisit/simplify.hh"
#include "tl/simplify.hh"
#define OPT_R 'r'
......
......@@ -28,7 +28,7 @@
#include "error.h"
#include "ltlvisit/print.hh"
#include "tl/print.hh"
#include "common_conv.hh"
// A set of tools for which we know the correct output
......
......@@ -86,8 +86,8 @@
#include <string>
#include <cstdlib>
#include <cstring>
#include "ltlast/formula.hh"
#include "ltlvisit/relabel.hh"
#include "tl/formula.hh"
#include "tl/relabel.hh"
using namespace spot;
using namespace spot::ltl;
......
......@@ -33,8 +33,8 @@
#include "common_aoutput.hh"
#include "common_post.hh"
#include "ltlast/formula.hh"
#include "ltlvisit/print.hh"
#include "tl/formula.hh"
#include "tl/print.hh"
#include "twaalgos/translate.hh"
#include "misc/optionmap.hh"
#include "misc/timer.hh"
......
......@@ -33,8 +33,8 @@
#include "common_post.hh"
#include "ltlparse/public.hh"
#include "ltlvisit/print.hh"
#include "ltlvisit/simplify.hh"
#include "tl/print.hh"
#include "tl/simplify.hh"
#include "twaalgos/dot.hh"
#include "twaalgos/ltl2tgba_fm.hh"
#include "twaalgos/translate.hh"
......
......@@ -39,10 +39,10 @@
#include "common_file.hh"
#include "common_finput.hh"
#include "parseaut/public.hh"
#include "ltlvisit/print.hh"
#include "ltlvisit/apcollect.hh"
#include "ltlvisit/mutation.hh"
#include "ltlvisit/relabel.hh"
#include "tl/print.hh"
#include "tl/apcollect.hh"
#include "tl/mutation.hh"
#include "tl/relabel.hh"
#include "twaalgos/lbtt.hh"
#include "twaalgos/hoa.hh"
#include "twaalgos/product.hh"
......
......@@ -35,7 +35,7 @@
#include "common_post.hh"
#include "common_trans.hh"
#include "ltlvisit/relabel.hh"
#include "tl/relabel.hh"
#include "misc/bareword.hh"
#include "misc/timer.hh"
#include "twaalgos/lbtt.hh"
......
......@@ -35,14 +35,14 @@
#include "common_r.hh"
#include "misc/hash.hh"
#include "ltlvisit/simplify.hh"
#include "ltlvisit/length.hh"
#include "ltlvisit/relabel.hh"
#include "ltlvisit/unabbrev.hh"
#include "ltlvisit/remove_x.hh"
#include "ltlvisit/apcollect.hh"
#include "ltlvisit/exclusive.hh"
#include "ltlvisit/print.hh"
#include "tl/simplify.hh"
#include "tl/length.hh"
#include "tl/relabel.hh"
#include "tl/unabbrev.hh"
#include "tl/remove_x.hh"
#include "tl/apcollect.hh"
#include "tl/exclusive.hh"
#include "tl/print.hh"
#include "twaalgos/ltl2tgba_fm.hh"
#include "twaalgos/minimize.hh"
#include "twaalgos/safety.hh"
......
......@@ -27,7 +27,7 @@
#include "common_output.hh"
#include "common_conv.hh"
#include "ltlvisit/mutation.hh"
#include "tl/mutation.hh"
enum {
OPT_AP2CONST = 1,
......
......@@ -33,8 +33,8 @@
#include "common_conv.hh"
#include <sstream>
#include "ltlvisit/randomltl.hh"
#include "ltlvisit/simplify.hh"
#include "tl/randomltl.hh"
#include "tl/simplify.hh"
#include "misc/random.hh"
#include "misc/optionmap.hh"
......
......@@ -21,7 +21,7 @@
#include <iosfwd>
#include "kripke.hh"
#include "ltlast/formula.hh"
#include "tl/formula.hh"
#include "kripkeprint.hh"
namespace spot
......
......@@ -21,7 +21,7 @@
#include "kripke/kripkeexplicit.hh"
#include "misc/location.hh"
#include "ltlenv/defaultenv.hh"
#include "tl/defaultenv.hh"
#include <string>
#include <list>
#include <utility>
......
## -*- coding: utf-8 -*-
## Copyright (C) 2009, 2010, 2011, 2013, 2014, 2015 Laboratoire de
## Recherche et Développement de l'Epita (LRDE).
## Copyright (C) 2003 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/>.
AM_CPPFLAGS = -I$(srcdir)/.. -I.. \
-I$(top_builddir)/lib -I$(top_srcdir)/lib
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
ltlastdir = $(pkgincludedir)/ltlast
ltlast_HEADERS = formula.hh
noinst_LTLIBRARIES = libltlast.la
libltlast_la_SOURCES = formula.cc
.deps
Makefile
Makefile.in
libltlenv.a
*.lo
*.la
.libs
## -*- coding: utf-8 -*-
## Copyright (C) 2013 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
## 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/>.
AM_CPPFLAGS = -I$(srcdir)/..
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
ltlenvdir = $(pkgincludedir)/ltlenv
ltlenv_HEADERS = \
declenv.hh \
defaultenv.hh \
environment.hh
noinst_LTLIBRARIES = libltlenv.la
libltlenv_la_SOURCES = \
declenv.cc \
defaultenv.cc
......@@ -35,8 +35,8 @@
#include <string>
#include <sstream>
#include "public.hh"
#include "ltlast/formula.hh"
#include "ltlvisit/print.hh"
#include "tl/formula.hh"
#include "tl/print.hh"
struct minmax_t { unsigned min, max; };
}
......
......@@ -22,9 +22,9 @@
#pragma once
#include "ltlast/formula.hh"
#include "tl/formula.hh"
#include "misc/location.hh"
#include "ltlenv/defaultenv.hh"
#include "tl/defaultenv.hh"
#include <string>
#include <list>
#include <utility>
......
.deps
Makefile
Makefile.in
*.lo
*.la
.libs
......@@ -21,7 +21,7 @@
#include "twa/twagraph.hh"
#include "misc/location.hh"
#include "ltlenv/defaultenv.hh"
#include "tl/defaultenv.hh"
#include <string>
#include <list>
#include <utility>
......
......@@ -21,7 +21,7 @@
#include <bddx.h>
#include "misc/hash.hh"
#include "ltlast/formula.hh"
#include "tl/formula.hh"
#include "twa/twagraph.hh"
namespace spot
......
......@@ -23,7 +23,7 @@
#include <list>
#include "twa/twa.hh"
#include <set>
#include "ltlast/formula.hh"
#include "tl/formula.hh"
#include <cassert>
#include "misc/bddlt.hh"
#include "ta.hh"
......
......@@ -23,7 +23,7 @@
#include <list>
#include "twa/twa.hh"
#include <set>
#include "ltlast/formula.hh"
#include "tl/formula.hh"
#include <cassert>
#include "misc/bddlt.hh"
#include "taexplicit.hh"
......
......@@ -27,10 +27,10 @@
#include <cstdlib>
#include <cstring>
#include "ltlparse/public.hh"
#include "ltlvisit/unabbrev.hh"
#include "ltlvisit/nenoform.hh"
#include "ltlvisit/simplify.hh"
#include "ltlvisit/print.hh"
#include "tl/unabbrev.hh"
#include "tl/nenoform.hh"
#include "tl/simplify.hh"
#include "tl/print.hh"
void
syntax(char* prog)
......
......@@ -26,9 +26,9 @@
#include <fstream>
#include <string>
#include <cstdlib>
#include "ltlvisit/print.hh"
#include "ltlvisit/apcollect.hh"
#include "ltlast/formula.hh"
#include "tl/print.hh"
#include "tl/apcollect.hh"
#include "tl/formula.hh"
#include "ltlparse/public.hh"
#include "twaalgos/ltl2tgba_fm.hh"
#include "twaalgos/ltl2taa.hh"
......
......@@ -22,7 +22,7 @@
#include <cstdlib>
#include <cstring>
#include "ltlparse/public.hh"
#include "ltlvisit/length.hh"
#include "tl/length.hh"
void
syntax(char *prog)
......
......@@ -21,8 +21,8 @@
#include <cassert>
#include <cstdlib>
#include "ltlparse/public.hh"
#include "ltlvisit/relabel.hh"
#include "ltlvisit/print.hh"
#include "tl/relabel.hh"
#include "tl/print.hh"
void
syntax(char *prog)
......
......@@ -31,15 +31,15 @@
#include <set>
#include <vector>
#include "ltlparse/public.hh"
#include "ltlvisit/apcollect.hh"
#include "ltlvisit/randomltl.hh"
#include "ltlvisit/print.hh"
#include "ltlvisit/length.hh"
#include "ltlvisit/simplify.hh"
#include "tl/apcollect.hh"
#include "tl/randomltl.hh"
#include "tl/print.hh"
#include "tl/length.hh"
#include "tl/simplify.hh"