rename src/ as spot/ and use include <spot/...>
* NEWS: Mention the change. * src/: Rename as ... * spot/: ... this, adjust all headers to include <spot/...> instead of "...", and adjust all Makefile.am to search headers from the top-level directory. * HACKING: Add conventions about #include. * spot/sanity/style.test: Add a few more grep to catch cases that do not follow these conventions. * .gitignore, Makefile.am, README, bench/stutter/Makefile.am, bench/stutter/stutter_invariance_formulas.cc, bench/stutter/stutter_invariance_randomgraph.cc, configure.ac, debian/rules, doc/Doxyfile.in, doc/Makefile.am, doc/org/.dir-locals.el.in, doc/org/g++wrap.in, doc/org/init.el.in, doc/org/tut01.org, doc/org/tut02.org, doc/org/tut03.org, doc/org/tut10.org, doc/org/tut20.org, doc/org/tut21.org, doc/org/tut22.org, doc/org/tut30.org, iface/ltsmin/Makefile.am, iface/ltsmin/kripke.test, iface/ltsmin/ltsmin.cc, iface/ltsmin/ltsmin.hh, iface/ltsmin/modelcheck.cc, wrap/python/Makefile.am, wrap/python/ajax/spotcgi.in, wrap/python/spot_impl.i, wrap/python/tests/ltl2tgba.py, wrap/python/tests/randgen.py, wrap/python/tests/run.in: Adjust.
This commit is contained in:
Alexandre Duret-Lutz
parent
1fddfe60ec
commit
f120dd3206
529 changed files with 1308 additions and 1262 deletions
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
SUBDIRS = . ajax tests
|
||||
|
||||
AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_builddir) -I$(top_srcdir) \
|
||||
$(BUDDY_CPPFLAGS) -DSWIG_TYPE_TABLE=spot
|
||||
|
||||
EXTRA_DIST = spot_impl.i buddy.i
|
||||
|
|
@ -37,10 +37,10 @@ MAINTAINERCLEANFILES = \
|
|||
|
||||
_spot_impl_la_SOURCES = $(srcdir)/spot_impl_wrap.cxx
|
||||
_spot_impl_la_LDFLAGS = -avoid-version -module $(SYMBOLIC_LDFLAGS)
|
||||
_spot_impl_la_LIBADD = $(top_builddir)/src/libspot.la
|
||||
_spot_impl_la_LIBADD = $(top_builddir)/spot/libspot.la
|
||||
|
||||
$(srcdir)/spot_impl_wrap.cxx: $(srcdir)/spot_impl.i
|
||||
$(SWIG) -c++ -python -I$(srcdir) -I$(top_srcdir)/src $(srcdir)/spot_impl.i
|
||||
$(SWIG) -c++ -python -I$(srcdir) -I$(top_srcdir) $(srcdir)/spot_impl.i
|
||||
|
||||
$(srcdir)/spot_impl.py: $(srcdir)/spot_impl.i
|
||||
$(MAKE) $(AM_MAKEFLAGS) spot_impl_wrap.cxx
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ if ('SERVER_SOFTWARE' in os.environ and
|
|||
# Darwin needs some help in figuring out where non-installed libtool
|
||||
# libraries are (on this platform libtool encodes the expected final
|
||||
# path of dependent libraries in each library).
|
||||
m = '../.libs:@top_builddir@/src/.libs:@top_builddir@/buddy/src/.libs'
|
||||
m = '../.libs:@top_builddir@/spot/.libs:@top_builddir@/buddy/spot/.libs'
|
||||
os.environ['DYLD_LIBRARY_PATH'] = m
|
||||
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -74,80 +74,80 @@
|
|||
#include <sstream>
|
||||
#include <signal.h>
|
||||
|
||||
#include "misc/common.hh"
|
||||
#include "misc/version.hh"
|
||||
#include "misc/minato.hh"
|
||||
#include "misc/optionmap.hh"
|
||||
#include "misc/random.hh"
|
||||
#include "misc/escape.hh"
|
||||
#include <spot/misc/common.hh>
|
||||
#include <spot/misc/version.hh>
|
||||
#include <spot/misc/minato.hh>
|
||||
#include <spot/misc/optionmap.hh>
|
||||
#include <spot/misc/random.hh>
|
||||
#include <spot/misc/escape.hh>
|
||||
|
||||
#include "tl/formula.hh"
|
||||
#include <spot/tl/formula.hh>
|
||||
|
||||
#include "tl/environment.hh"
|
||||
#include "tl/defaultenv.hh"
|
||||
#include <spot/tl/environment.hh>
|
||||
#include <spot/tl/defaultenv.hh>
|
||||
|
||||
#include "tl/parse.hh"
|
||||
#include <spot/tl/parse.hh>
|
||||
|
||||
#include "twa/bdddict.hh"
|
||||
#include <spot/twa/bdddict.hh>
|
||||
|
||||
#include "tl/apcollect.hh"
|
||||
#include "tl/dot.hh"
|
||||
#include "tl/nenoform.hh"
|
||||
#include "tl/print.hh"
|
||||
#include "tl/simplify.hh"
|
||||
#include "tl/unabbrev.hh"
|
||||
#include "tl/randomltl.hh"
|
||||
#include "tl/length.hh"
|
||||
#include "tl/remove_x.hh"
|
||||
#include "tl/relabel.hh"
|
||||
#include <spot/tl/apcollect.hh>
|
||||
#include <spot/tl/dot.hh>
|
||||
#include <spot/tl/nenoform.hh>
|
||||
#include <spot/tl/print.hh>
|
||||
#include <spot/tl/simplify.hh>
|
||||
#include <spot/tl/unabbrev.hh>
|
||||
#include <spot/tl/randomltl.hh>
|
||||
#include <spot/tl/length.hh>
|
||||
#include <spot/tl/remove_x.hh>
|
||||
#include <spot/tl/relabel.hh>
|
||||
|
||||
#include "twa/bddprint.hh"
|
||||
#include "twa/fwd.hh"
|
||||
#include "twa/acc.hh"
|
||||
#include "twa/twa.hh"
|
||||
#include "twa/taatgba.hh"
|
||||
#include "twa/twaproduct.hh"
|
||||
#include <spot/twa/bddprint.hh>
|
||||
#include <spot/twa/fwd.hh>
|
||||
#include <spot/twa/acc.hh>
|
||||
#include <spot/twa/twa.hh>
|
||||
#include <spot/twa/taatgba.hh>
|
||||
#include <spot/twa/twaproduct.hh>
|
||||
|
||||
#include "twaalgos/cleanacc.hh"
|
||||
#include "twaalgos/dot.hh"
|
||||
#include "twaalgos/degen.hh"
|
||||
#include "twaalgos/copy.hh"
|
||||
#include "twaalgos/complete.hh"
|
||||
#include "twaalgos/complement.hh"
|
||||
#include "twaalgos/emptiness.hh"
|
||||
#include "twaalgos/gtec/gtec.hh"
|
||||
#include "twaalgos/lbtt.hh"
|
||||
#include "twaalgos/ltl2taa.hh"
|
||||
#include "twaalgos/ltl2tgba_fm.hh"
|
||||
#include "twaalgos/compsusp.hh"
|
||||
#include "twaalgos/magic.hh"
|
||||
#include "twaalgos/minimize.hh"
|
||||
#include "twaalgos/neverclaim.hh"
|
||||
#include "twaalgos/remfin.hh"
|
||||
#include "twaalgos/strength.hh"
|
||||
#include "twaalgos/sccfilter.hh"
|
||||
#include "twaalgos/stats.hh"
|
||||
#include "twaalgos/isdet.hh"
|
||||
#include "twaalgos/isunamb.hh"
|
||||
#include "twaalgos/simulation.hh"
|
||||
#include "twaalgos/postproc.hh"
|
||||
#include "twaalgos/product.hh"
|
||||
#include "twaalgos/stutter.hh"
|
||||
#include "twaalgos/translate.hh"
|
||||
#include "twaalgos/hoa.hh"
|
||||
#include "twaalgos/dtwasat.hh"
|
||||
#include "twaalgos/relabel.hh"
|
||||
#include <spot/twaalgos/cleanacc.hh>
|
||||
#include <spot/twaalgos/dot.hh>
|
||||
#include <spot/twaalgos/degen.hh>
|
||||
#include <spot/twaalgos/copy.hh>
|
||||
#include <spot/twaalgos/complete.hh>
|
||||
#include <spot/twaalgos/complement.hh>
|
||||
#include <spot/twaalgos/emptiness.hh>
|
||||
#include <spot/twaalgos/gtec/gtec.hh>
|
||||
#include <spot/twaalgos/lbtt.hh>
|
||||
#include <spot/twaalgos/ltl2taa.hh>
|
||||
#include <spot/twaalgos/ltl2tgba_fm.hh>
|
||||
#include <spot/twaalgos/compsusp.hh>
|
||||
#include <spot/twaalgos/magic.hh>
|
||||
#include <spot/twaalgos/minimize.hh>
|
||||
#include <spot/twaalgos/neverclaim.hh>
|
||||
#include <spot/twaalgos/remfin.hh>
|
||||
#include <spot/twaalgos/strength.hh>
|
||||
#include <spot/twaalgos/sccfilter.hh>
|
||||
#include <spot/twaalgos/stats.hh>
|
||||
#include <spot/twaalgos/isdet.hh>
|
||||
#include <spot/twaalgos/isunamb.hh>
|
||||
#include <spot/twaalgos/simulation.hh>
|
||||
#include <spot/twaalgos/postproc.hh>
|
||||
#include <spot/twaalgos/product.hh>
|
||||
#include <spot/twaalgos/stutter.hh>
|
||||
#include <spot/twaalgos/translate.hh>
|
||||
#include <spot/twaalgos/hoa.hh>
|
||||
#include <spot/twaalgos/dtwasat.hh>
|
||||
#include <spot/twaalgos/relabel.hh>
|
||||
|
||||
#include "parseaut/public.hh"
|
||||
#include <spot/parseaut/public.hh>
|
||||
|
||||
#include "ta/ta.hh"
|
||||
#include "ta/tgta.hh"
|
||||
#include "ta/taexplicit.hh"
|
||||
#include "ta/tgtaexplicit.hh"
|
||||
#include "taalgos/tgba2ta.hh"
|
||||
#include "taalgos/dot.hh"
|
||||
#include "taalgos/stats.hh"
|
||||
#include "taalgos/minimize.hh"
|
||||
#include <spot/ta/ta.hh>
|
||||
#include <spot/ta/tgta.hh>
|
||||
#include <spot/ta/taexplicit.hh>
|
||||
#include <spot/ta/tgtaexplicit.hh>
|
||||
#include <spot/taalgos/tgba2ta.hh>
|
||||
#include <spot/taalgos/dot.hh>
|
||||
#include <spot/taalgos/stats.hh>
|
||||
#include <spot/taalgos/minimize.hh>
|
||||
|
||||
using namespace spot;
|
||||
%}
|
||||
|
|
@ -238,16 +238,16 @@ using namespace spot;
|
|||
%rename(FalseVal) False;
|
||||
%rename(TrueVal) True;
|
||||
|
||||
%include "misc/common.hh"
|
||||
%include "misc/version.hh"
|
||||
%include "misc/minato.hh"
|
||||
%include "misc/optionmap.hh"
|
||||
%include "misc/random.hh"
|
||||
%include "misc/escape.hh"
|
||||
%include <spot/misc/common.hh>
|
||||
%include <spot/misc/version.hh>
|
||||
%include <spot/misc/minato.hh>
|
||||
%include <spot/misc/optionmap.hh>
|
||||
%include <spot/misc/random.hh>
|
||||
%include <spot/misc/escape.hh>
|
||||
|
||||
%implicitconv std::vector<spot::formula>;
|
||||
|
||||
%include "tl/formula.hh"
|
||||
%include <spot/tl/formula.hh>
|
||||
|
||||
namespace std {
|
||||
%template(liststr) list<std::string>;
|
||||
|
|
@ -256,78 +256,78 @@ namespace std {
|
|||
%template(relabeling_map) map<spot::formula, spot::formula>;
|
||||
}
|
||||
|
||||
%include "tl/environment.hh"
|
||||
%include "tl/defaultenv.hh"
|
||||
%include <spot/tl/environment.hh>
|
||||
%include <spot/tl/defaultenv.hh>
|
||||
|
||||
%include "tl/parse.hh"
|
||||
%include <spot/tl/parse.hh>
|
||||
|
||||
/* these must come before apcollect.hh */
|
||||
%include "twa/bdddict.hh"
|
||||
%include "twa/bddprint.hh"
|
||||
%include "twa/fwd.hh"
|
||||
%include <spot/twa/bdddict.hh>
|
||||
%include <spot/twa/bddprint.hh>
|
||||
%include <spot/twa/fwd.hh>
|
||||
%feature("flatnested") spot::acc_cond::mark_t;
|
||||
%feature("flatnested") spot::acc_cond::acc_code;
|
||||
%apply bool* OUTPUT {bool& max, bool& odd};
|
||||
%include "twa/acc.hh"
|
||||
%include "twa/twa.hh"
|
||||
%include <spot/twa/acc.hh>
|
||||
%include <spot/twa/twa.hh>
|
||||
|
||||
%include "tl/apcollect.hh"
|
||||
%include "tl/dot.hh"
|
||||
%include "tl/nenoform.hh"
|
||||
%include "tl/print.hh"
|
||||
%include "tl/simplify.hh"
|
||||
%include "tl/unabbrev.hh"
|
||||
%include "tl/randomltl.hh"
|
||||
%include "tl/length.hh"
|
||||
%include "tl/remove_x.hh"
|
||||
%include "tl/relabel.hh"
|
||||
%include <spot/tl/apcollect.hh>
|
||||
%include <spot/tl/dot.hh>
|
||||
%include <spot/tl/nenoform.hh>
|
||||
%include <spot/tl/print.hh>
|
||||
%include <spot/tl/simplify.hh>
|
||||
%include <spot/tl/unabbrev.hh>
|
||||
%include <spot/tl/randomltl.hh>
|
||||
%include <spot/tl/length.hh>
|
||||
%include <spot/tl/remove_x.hh>
|
||||
%include <spot/tl/relabel.hh>
|
||||
|
||||
%include "twa/taatgba.hh"
|
||||
%include "twa/twaproduct.hh"
|
||||
%include "twa/twagraph.hh"
|
||||
%include <spot/twa/taatgba.hh>
|
||||
%include <spot/twa/twaproduct.hh>
|
||||
%include <spot/twa/twagraph.hh>
|
||||
|
||||
// Should come after the definition of twa_graph
|
||||
|
||||
%include "twaalgos/cleanacc.hh"
|
||||
%include "twaalgos/degen.hh"
|
||||
%include "twaalgos/dot.hh"
|
||||
%include "twaalgos/copy.hh"
|
||||
%include "twaalgos/complete.hh"
|
||||
%include "twaalgos/complement.hh"
|
||||
%include "twaalgos/emptiness.hh"
|
||||
%include "twaalgos/gtec/gtec.hh"
|
||||
%include "twaalgos/lbtt.hh"
|
||||
%include "twaalgos/ltl2taa.hh"
|
||||
%include "twaalgos/ltl2tgba_fm.hh"
|
||||
%include "twaalgos/compsusp.hh"
|
||||
%include "twaalgos/magic.hh"
|
||||
%include "twaalgos/minimize.hh"
|
||||
%include "twaalgos/neverclaim.hh"
|
||||
%include "twaalgos/strength.hh"
|
||||
%include "twaalgos/remfin.hh"
|
||||
%include "twaalgos/sccfilter.hh"
|
||||
%include "twaalgos/stats.hh"
|
||||
%include "twaalgos/isdet.hh"
|
||||
%include "twaalgos/isunamb.hh"
|
||||
%include "twaalgos/simulation.hh"
|
||||
%include "twaalgos/postproc.hh"
|
||||
%include "twaalgos/product.hh"
|
||||
%include "twaalgos/stutter.hh"
|
||||
%include "twaalgos/translate.hh"
|
||||
%include "twaalgos/hoa.hh"
|
||||
%include "twaalgos/dtwasat.hh"
|
||||
%include "twaalgos/relabel.hh"
|
||||
%include <spot/twaalgos/cleanacc.hh>
|
||||
%include <spot/twaalgos/degen.hh>
|
||||
%include <spot/twaalgos/dot.hh>
|
||||
%include <spot/twaalgos/copy.hh>
|
||||
%include <spot/twaalgos/complete.hh>
|
||||
%include <spot/twaalgos/complement.hh>
|
||||
%include <spot/twaalgos/emptiness.hh>
|
||||
%include <spot/twaalgos/gtec/gtec.hh>
|
||||
%include <spot/twaalgos/lbtt.hh>
|
||||
%include <spot/twaalgos/ltl2taa.hh>
|
||||
%include <spot/twaalgos/ltl2tgba_fm.hh>
|
||||
%include <spot/twaalgos/compsusp.hh>
|
||||
%include <spot/twaalgos/magic.hh>
|
||||
%include <spot/twaalgos/minimize.hh>
|
||||
%include <spot/twaalgos/neverclaim.hh>
|
||||
%include <spot/twaalgos/strength.hh>
|
||||
%include <spot/twaalgos/remfin.hh>
|
||||
%include <spot/twaalgos/sccfilter.hh>
|
||||
%include <spot/twaalgos/stats.hh>
|
||||
%include <spot/twaalgos/isdet.hh>
|
||||
%include <spot/twaalgos/isunamb.hh>
|
||||
%include <spot/twaalgos/simulation.hh>
|
||||
%include <spot/twaalgos/postproc.hh>
|
||||
%include <spot/twaalgos/product.hh>
|
||||
%include <spot/twaalgos/stutter.hh>
|
||||
%include <spot/twaalgos/translate.hh>
|
||||
%include <spot/twaalgos/hoa.hh>
|
||||
%include <spot/twaalgos/dtwasat.hh>
|
||||
%include <spot/twaalgos/relabel.hh>
|
||||
|
||||
%include "parseaut/public.hh"
|
||||
%include <spot/parseaut/public.hh>
|
||||
|
||||
%include "ta/ta.hh"
|
||||
%include "ta/tgta.hh"
|
||||
%include "ta/taexplicit.hh"
|
||||
%include "ta/tgtaexplicit.hh"
|
||||
%include "taalgos/tgba2ta.hh"
|
||||
%include "taalgos/dot.hh"
|
||||
%include "taalgos/stats.hh"
|
||||
%include "taalgos/minimize.hh"
|
||||
%include <spot/ta/ta.hh>
|
||||
%include <spot/ta/tgta.hh>
|
||||
%include <spot/ta/taexplicit.hh>
|
||||
%include <spot/ta/tgtaexplicit.hh>
|
||||
%include <spot/taalgos/tgba2ta.hh>
|
||||
%include <spot/taalgos/dot.hh>
|
||||
%include <spot/taalgos/stats.hh>
|
||||
%include <spot/taalgos/minimize.hh>
|
||||
|
||||
|
||||
#undef ltl
|
||||
|
|
|
|||
|
|
@ -20,8 +20,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/>.
|
||||
|
||||
# This is a python translation of the ltl2tgba C++ test program.
|
||||
# Compare with src/tgbatest/ltl2tgba.cc.
|
||||
# This is a python implementation of a small ltl2tgba translator that calls the
|
||||
# translation and simplifications functions itself. It's better to use the
|
||||
# translate() function today.
|
||||
|
||||
import sys
|
||||
import getopt
|
||||
|
|
|
|||
|
|
@ -17,9 +17,6 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# This is a python translation of the ltl2tgba C++ test program.
|
||||
# Compare with src/tgbatest/ltl2tgba.cc.
|
||||
|
||||
import spot
|
||||
|
||||
o = spot.option_map()
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
# Darwin needs some help in figuring out where non-installed libtool
|
||||
# libraries are (on this platform libtool encodes the expected final
|
||||
# path of dependent libraries in each library).
|
||||
modpath='../.libs:@top_builddir@/src/.libs:@top_builddir@/buddy/src/.libs'
|
||||
modpath='../.libs:@top_builddir@/spot/.libs:@top_builddir@/buddy/spot/.libs'
|
||||
|
||||
# .. is for the *.py files, and ../.libs for the *.so. We used to
|
||||
# rely on a module called ltihooks.py to teach the import function how
|
||||
|
|
@ -32,7 +32,7 @@ modpath='../.libs:@top_builddir@/src/.libs:@top_builddir@/buddy/src/.libs'
|
|||
# Python 2.6.
|
||||
pypath='..:../.libs:@srcdir@/..:@srcdir@/../.libs:$PYTHONPATH'
|
||||
|
||||
PATH="@abs_top_builddir@/src/bin:$PATH"
|
||||
PATH="@abs_top_builddir@/spot/bin:$PATH"
|
||||
export PATH
|
||||
|
||||
test -z "$1" &&
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue