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.

src/Makefile.am

@@ -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

src/bin/autfilt.cc

@@ -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"

src/bin/common_output.cc

@@ -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"

src/bin/common_output.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"

src/bin/common_r.hh

@@ -20,7 +20,7 @@
 #pragma once
 
 #include "common_sys.hh"
-#include "ltlvisit/simplify.hh"
+#include "tl/simplify.hh"
 
 #define OPT_R 'r'
 

src/bin/common_trans.cc

@@ -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

src/bin/genltl.cc

@@ -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;

src/bin/ltl2tgba.cc

@@ -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"

src/bin/ltl2tgta.cc

@@ -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"

src/bin/ltlcross.cc

@@ -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"

src/bin/ltldo.cc

@@ -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"

src/bin/ltlfilt.cc

@@ -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"

src/bin/ltlgrind.cc

@@ -27,7 +27,7 @@
 #include "common_output.hh"
 #include "common_conv.hh"
 
-#include "ltlvisit/mutation.hh"
+#include "tl/mutation.hh"
 
 enum {
   OPT_AP2CONST = 1,

src/bin/randltl.cc

@@ -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"
 

src/kripke/kripkeexplicit.hh

@@ -21,7 +21,7 @@
 
 #include <iosfwd>
 #include "kripke.hh"
-#include "ltlast/formula.hh"
+#include "tl/formula.hh"
 #include "kripkeprint.hh"
 
 namespace spot

src/kripkeparse/public.hh

@@ -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>

src/ltlast/Makefile.am

@@ -1,32 +0,0 @@
-## -*- 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

src/ltlenv/.gitignore

@@ -1,7 +0,0 @@
-.deps
-Makefile
-Makefile.in
-libltlenv.a
-*.lo
-*.la
-.libs

src/ltlenv/Makefile.am

@@ -1,36 +0,0 @@
-## -*- 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

src/ltlparse/ltlparse.yy

@@ -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; };
 }

src/ltlparse/public.hh

@@ -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>

src/ltlvisit/.gitignore

@@ -1,6 +0,0 @@
-.deps
-Makefile
-Makefile.in
-*.lo
-*.la
-.libs

src/ltlvisit/Makefile.am

@@ -1,63 +0,0 @@
-## -*- coding: utf-8 -*-
-## Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015 Laboratoire de
-## Recherche et Developpement de l'Epita (LRDE).
-## Copyright (C) 2004, 2005, 2006 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.. $(BUDDY_CPPFLAGS)
-AM_CXXFLAGS = $(WARNING_CXXFLAGS)
-
-ltlvisitdir = $(pkgincludedir)/ltlvisit
-
-ltlvisit_HEADERS = \
-  apcollect.hh \
-  contain.hh \
-  dot.hh \
-  exclusive.hh \
-  length.hh \
-  mutation.hh \
-  nenoform.hh \
-  print.hh \
-  randomltl.hh \
-  relabel.hh \
-  remove_x.hh \
-  simpfg.hh \
-  simplify.hh \
-  snf.hh \
-  unabbrev.hh
-
-noinst_LTLIBRARIES = libltlvisit.la
-libltlvisit_la_SOURCES = \
-  apcollect.cc \
-  contain.cc \
-  dot.cc \
-  exclusive.cc \
-  length.cc \
-  mark.cc \
-  mark.hh \
-  mutation.cc \
-  nenoform.cc \
-  print.cc \
-  randomltl.cc \
-  relabel.cc \
-  remove_x.cc \
-  simpfg.cc \
-  simplify.cc \
-  snf.cc \
-  unabbrev.cc

src/parseaut/public.hh

@@ -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>

src/priv/accmap.hh

@@ -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

src/ta/taexplicit.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 "ta.hh"

src/ta/tgtaexplicit.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"

src/tests/equalsf.cc

@@ -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)

src/tests/ikwiad.cc

@@ -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"

src/tests/length.cc

@@ -22,7 +22,7 @@
 #include <cstdlib>
 #include <cstring>
 #include "ltlparse/public.hh"
-#include "ltlvisit/length.hh"
+#include "tl/length.hh"
 
 void
 syntax(char *prog)

src/tests/ltlrel.cc

@@ -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)

src/tests/randtgba.cc

@@ -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"
 #include "twaalgos/randomgraph.hh"
 #include "twaalgos/hoa.hh"
 #include "twaalgos/stats.hh"
-#include "ltlenv/defaultenv.hh"
+#include "tl/defaultenv.hh"
 #include "twaalgos/dot.hh"
 #include "misc/random.hh"
 #include "misc/optionmap.hh"

src/tests/readltl.cc

@@ -25,7 +25,7 @@
 #include <cstdlib>
 #include <cstring>
 #include "ltlparse/public.hh"
-#include "ltlvisit/dot.hh"
+#include "tl/dot.hh"
 
 void
 syntax(char* prog)

src/tests/reduc.cc

@@ -27,9 +27,9 @@
 #include <string>
 #include <cstring>
 #include "ltlparse/public.hh"
-#include "ltlvisit/print.hh"
-#include "ltlvisit/simplify.hh"
-#include "ltlvisit/length.hh"
+#include "tl/print.hh"
+#include "tl/simplify.hh"
+#include "tl/length.hh"
 
 void
 syntax(char* prog)

src/tests/syntimpl.cc

@@ -24,9 +24,9 @@
 #include <cassert>
 #include <cstdlib>
 #include "ltlparse/public.hh"
-#include "ltlvisit/print.hh"
-#include "ltlvisit/simplify.hh"
-#include "ltlvisit/nenoform.hh"
+#include "tl/print.hh"
+#include "tl/simplify.hh"
+#include "tl/nenoform.hh"
 
 void
 syntax(char* prog)

src/tests/taatgba.cc

@@ -20,7 +20,7 @@
 #include <iostream>
 #include <cassert>
 #include "misc/hash.hh"
-#include "ltlenv/defaultenv.hh"
+#include "tl/defaultenv.hh"
 #include "twaalgos/dot.hh"
 #include "twa/taatgba.hh"
 

src/tests/tostring.cc

@@ -24,7 +24,7 @@
 #include <cassert>
 #include <cstdlib>
 #include "ltlparse/public.hh"
-#include "ltlvisit/print.hh"
+#include "tl/print.hh"
 
 void
 syntax(char *prog)

src/tests/twagraph.cc

@@ -21,7 +21,7 @@
 #include <iostream>
 #include "twa/twagraph.hh"
 #include "twaalgos/dot.hh"
-#include "ltlenv/defaultenv.hh"
+#include "tl/defaultenv.hh"
 
 void f1()
 {

src/tl/.gitignore

@@ -1,6 +1,7 @@
 .deps
 Makefile
 Makefile.in
+libtl.a
 *.lo
 *.la
 .libs

src/tl/Makefile.am

@@ -0,0 +1,67 @@
+## -*- coding: utf-8 -*-
+## Copyright (C) 2015 Laboratoire de Recherche et Développement 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 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.. $(BUDDY_CPPFLAGS)
+AM_CXXFLAGS = $(WARNING_CXXFLAGS)
+
+tldir = $(pkgincludedir)/tl
+
+tl_HEADERS =					\
+  apcollect.hh					\
+  contain.hh					\
+  declenv.hh					\
+  defaultenv.hh					\
+  dot.hh					\
+  environment.hh				\
+  exclusive.hh					\
+  formula.hh					\
+  length.hh					\
+  mutation.hh					\
+  nenoform.hh					\
+  print.hh					\
+  randomltl.hh					\
+  relabel.hh					\
+  remove_x.hh					\
+  simpfg.hh					\
+  simplify.hh					\
+  snf.hh					\
+  unabbrev.hh
+
+noinst_LTLIBRARIES = libtl.la
+libtl_la_SOURCES =				\
+  apcollect.cc					\
+  contain.cc					\
+  declenv.cc					\
+  defaultenv.cc					\
+  dot.cc					\
+  exclusive.cc					\
+  formula.cc					\
+  length.cc					\
+  mark.cc					\
+  mark.hh					\
+  mutation.cc					\
+  nenoform.cc					\
+  print.cc					\
+  randomltl.cc					\
+  relabel.cc					\
+  remove_x.cc					\
+  simpfg.cc					\
+  simplify.cc					\
+  snf.cc					\
+  unabbrev.cc

src/tl/apcollect.hh

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "formula.hh"
 #include <set>
 #include <bddx.h>
 #include "twa/fwd.hh"

src/tl/contain.cc

@@ -22,7 +22,7 @@
 
 #include "contain.hh"
 #include "simplify.hh"
-#include "ltlast/formula.hh"
+#include "formula.hh"
 #include "twaalgos/product.hh"
 
 namespace spot

src/tl/contain.hh

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "formula.hh"
 #include "twaalgos/ltl2tgba_fm.hh"
 #include "misc/hash.hh"
 #include <map>

src/tl/declenv.hh

@@ -25,7 +25,7 @@
 #include "environment.hh"
 #include <string>
 #include <map>
-#include "ltlast/formula.hh"
+#include "formula.hh"
 
 namespace spot
 {

src/tl/defaultenv.hh

@@ -23,7 +23,7 @@
 #pragma once
 
 #include "environment.hh"
-#include "ltlast/formula.hh"
+#include "formula.hh"
 
 namespace spot
 {

src/tl/dot.cc

@@ -21,7 +21,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "dot.hh"
-#include "ltlast/formula.hh"
+#include "formula.hh"
 #include <unordered_map>
 #include <ostream>
 #include <sstream>

src/tl/dot.hh

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <ltlast/formula.hh>
+#include "formula.hh"
 
 namespace spot
 {

src/tl/environment.hh

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "formula.hh"
 #include <string>
 
 namespace spot

src/tl/exclusive.hh

@@ -20,7 +20,7 @@
 #pragma once
 
 #include <vector>
-#include "ltlast/formula.hh"
+#include "formula.hh"
 #include "twa/twagraph.hh"
 
 namespace spot

src/tl/formula.cc

@@ -28,6 +28,11 @@
 #include <algorithm>
 #include "misc/bareword.hh"
 
+#ifndef HAVE_STRVERSCMP
+// If the libc does not have this, a version is compiled in lib/.
+extern "C" int strverscmp(const char *s1, const char *s2);
+#endif
+
 namespace spot
 {
   namespace

src/tl/formula.hh

@@ -17,7 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-/// \file ltlast/formula.hh
+/// \file tlformula.hh
 /// \brief LTL/PSL formula interface
 #pragma once
 

src/tl/length.cc

@@ -21,7 +21,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "length.hh"
-#include "ltlast/formula.hh"
+#include "formula.hh"
 
 namespace spot
 {

src/tl/length.hh

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "formula.hh"
 
 namespace spot
 {

src/tl/mark.hh

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "formula.hh"
 #include "misc/hash.hh"
 
 namespace spot

src/tl/mutation.cc

@@ -20,9 +20,9 @@
 #include <set>
 #include <algorithm>
 
-#include "ltlvisit/apcollect.hh"
-#include "ltlvisit/mutation.hh"
-#include "ltlvisit/length.hh"
+#include "apcollect.hh"
+#include "mutation.hh"
+#include "length.hh"
 
 #define And_(x, y) formula::And({(x), (y)})
 #define AndRat_(x, y) formula::AndRat({(x), (y)})

src/tl/mutation.hh

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "formula.hh"
 #include <vector>
 
 namespace spot

src/tl/nenoform.hh

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "formula.hh"
 
 namespace spot
 {

src/tl/print.hh

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <ltlast/formula.hh>
+#include "formula.hh"
 #include <iosfwd>
 
 namespace spot

src/tl/randomltl.cc

@@ -27,7 +27,7 @@
 #include <iostream>
 #include <cstring>
 #include "misc/optionmap.hh"
-#include "ltlenv/defaultenv.hh"
+#include "defaultenv.hh"
 #include <sstream>
 
 namespace spot

src/tl/relabel.hh

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "formula.hh"
 #include "misc/hash.hh"
 #include <map>
 

src/tl/remove_x.cc

@@ -17,9 +17,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "ltlvisit/simplify.hh"
-#include "ltlvisit/apcollect.hh"
-#include "ltlvisit/remove_x.hh"
+#include "simplify.hh"
+#include "apcollect.hh"
+#include "remove_x.hh"
 
 namespace spot
 {

src/tl/remove_x.hh

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "formula.hh"
 
 namespace spot
 {

src/tl/simpfg.hh

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "formula.hh"
 
 namespace spot
 {

src/tl/simplify.cc

@@ -27,9 +27,9 @@
 
 #include "simplify.hh"
 #include <unordered_map>
-#include "ltlvisit/contain.hh"
-#include "ltlvisit/print.hh"
-#include "ltlvisit/snf.hh"
+#include "contain.hh"
+#include "print.hh"
+#include "snf.hh"
 #include "twa/formula2bdd.hh"
 #include <cassert>
 #include <memory>

src/tl/simplify.hh

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "formula.hh"
 #include <bddx.h>
 #include "twa/bdddict.hh"
 #include <iosfwd>

src/tl/snf.hh

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "formula.hh"
 #include <unordered_map>
 
 namespace spot

src/tl/unabbrev.hh

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "formula.hh"
 #include <unordered_map>
 
 namespace spot

src/twa/acc.hh

@@ -23,7 +23,7 @@
 #include <unordered_map>
 #include <sstream>
 #include <vector>
-#include "ltlenv/defaultenv.hh"
+#include "tl/defaultenv.hh"
 #include <iostream>
 
 namespace spot

src/twa/bdddict.cc

@@ -23,9 +23,9 @@
 #include <ostream>
 #include <sstream>
 #include <cassert>
-#include <ltlvisit/print.hh>
-#include <ltlast/formula.hh>
-#include <ltlenv/defaultenv.hh>
+#include "tl/print.hh"
+#include "tl/formula.hh"
+#include "tl/defaultenv.hh"
 #include "priv/bddalloc.hh"
 #include "bdddict.hh"
 

src/twa/bdddict.hh

@@ -29,7 +29,7 @@
 #include <bddx.h>
 #include <vector>
 #include <memory>
-#include "ltlast/formula.hh"
+#include "tl/formula.hh"
 
 namespace spot
 {

src/twa/bddprint.cc

@@ -24,7 +24,7 @@
 #include <cassert>
 #include <ostream>
 #include "bddprint.hh"
-#include "ltlvisit/print.hh"
+#include "tl/print.hh"
 #include "formula2bdd.hh"
 #include "misc/minato.hh"
 

src/twa/taatgba.cc

@@ -22,7 +22,7 @@
 #include <iterator>
 #include <iostream>
 #include "twa/formula2bdd.hh"
-#include "ltlvisit/print.hh"
+#include "tl/print.hh"
 #include "taatgba.hh"
 
 namespace spot

src/twa/taatgba.hh

@@ -24,7 +24,7 @@
 #include <vector>
 #include <string>
 #include "misc/hash.hh"
-#include "ltlast/formula.hh"
+#include "tl/formula.hh"
 #include "bdddict.hh"
 #include "twa.hh"
 

src/twa/twa.hh

@@ -33,7 +33,7 @@
 #include <vector>
 #include "misc/casts.hh"
 #include "misc/hash.hh"
-#include "ltlast/formula.hh"
+#include "tl/formula.hh"
 
 namespace spot
 {

src/twa/twagraph.cc

@@ -18,7 +18,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "twagraph.hh"
-#include "ltlvisit/print.hh"
+#include "tl/print.hh"
 
 namespace spot
 {

src/twa/twagraph.hh

@@ -25,7 +25,7 @@
 #include "twa/bdddict.hh"
 #include "twa/twa.hh"
 #include "twaalgos/dupexp.hh"
-#include "ltlast/formula.hh"
+#include "tl/formula.hh"
 #include <sstream>
 
 namespace spot

src/twa/twasafracomplement.cc

@@ -30,7 +30,7 @@
 #include "twa/bdddict.hh"
 #include "twa/twa.hh"
 #include "misc/hashfunc.hh"
-#include "ltlast/formula.hh"
+#include "tl/formula.hh"
 #include "twaalgos/dot.hh"
 #include "twa/twasafracomplement.hh"
 #include "twaalgos/degen.hh"

src/twaalgos/compsusp.cc

@@ -25,10 +25,10 @@
 #include "minimize.hh"
 #include "simulation.hh"
 #include "safety.hh"
-#include "ltlvisit/print.hh"
+#include "tl/print.hh"
 #include <queue>
 #include <sstream>
-#include "ltlenv/environment.hh"
+#include "tl/environment.hh"
 
 namespace spot
 {

src/twaalgos/compsusp.hh

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "tl/formula.hh"
 #include "twa/twagraph.hh"
 
 namespace spot

src/twaalgos/dtgbasat.cc

@@ -27,7 +27,7 @@
 #include "sccinfo.hh"
 #include "twa/bddprint.hh"
 #include "stats.hh"
-#include "ltlenv/defaultenv.hh"
+#include "tl/defaultenv.hh"
 #include "misc/satsolver.hh"
 #include "misc/timer.hh"
 #include "isweakscc.hh"

src/twaalgos/hoa.cc

@@ -32,7 +32,7 @@
 #include "misc/bddlt.hh"
 #include "misc/minato.hh"
 #include "twa/formula2bdd.hh"
-#include "ltlast/formula.hh"
+#include "tl/formula.hh"
 
 namespace spot
 {

src/twaalgos/isweakscc.cc

@@ -18,7 +18,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "cycles.hh"
-#include "ltlast/formula.hh"
+#include "tl/formula.hh"
 #include "isweakscc.hh"
 
 namespace spot

src/twaalgos/lbtt.cc

@@ -28,7 +28,7 @@
 #include "reachiter.hh"
 #include "misc/bddlt.hh"
 #include "priv/accmap.hh"
-#include "ltlvisit/print.hh"
+#include "tl/print.hh"
 #include "ltlparse/public.hh"
 
 namespace spot

src/twaalgos/ltl2taa.cc

@@ -19,9 +19,9 @@
 
 #include <utility>
 #include <algorithm>
-#include "ltlvisit/unabbrev.hh"
-#include "ltlvisit/nenoform.hh"
-#include "ltlvisit/contain.hh"
+#include "tl/unabbrev.hh"
+#include "tl/nenoform.hh"
+#include "tl/contain.hh"
 #include "ltl2taa.hh"
 
 namespace spot

src/twaalgos/ltl2taa.hh

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "tl/formula.hh"
 #include "twa/taatgba.hh"
 
 namespace spot

src/twaalgos/ltl2tgba_fm.cc

@@ -23,11 +23,11 @@
 #include "misc/hash.hh"
 #include "misc/bddlt.hh"
 #include "misc/minato.hh"
-#include "ltlvisit/nenoform.hh"
-#include "ltlvisit/print.hh"
-#include "ltlvisit/apcollect.hh"
-#include "ltlvisit/mark.hh"
-#include "ltlvisit/print.hh"
+#include "tl/nenoform.hh"
+#include "tl/print.hh"
+#include "tl/apcollect.hh"
+#include "tl/mark.hh"
+#include "tl/print.hh"
 #include <cassert>
 #include <memory>
 #include <utility>

src/twaalgos/ltl2tgba_fm.hh

@@ -22,10 +22,10 @@
 
 #pragma once
 
-#include "ltlast/formula.hh"
+#include "tl/formula.hh"
 #include "twa/twagraph.hh"
-#include "ltlvisit/apcollect.hh"
-#include "ltlvisit/simplify.hh"
+#include "tl/apcollect.hh"
+#include "tl/simplify.hh"
 
 namespace spot
 {

src/twaalgos/minimize.hh

@@ -20,7 +20,7 @@
 #pragma once
 
 #include "twa/twagraph.hh"
-#include "ltlast/formula.hh"
+#include "tl/formula.hh"
 
 namespace spot
 {