From f120dd3206739adc5e34af71a12adab91ec37b9f Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 4 Dec 2015 19:42:23 +0100 Subject: [PATCH] rename src/ as spot/ and use include * NEWS: Mention the change. * src/: Rename as ... * spot/: ... this, adjust all headers to include 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. --- .gitignore | 3 +- HACKING | 20 ++ Makefile.am | 2 +- NEWS | 16 ++ README | 4 +- bench/stutter/Makefile.am | 6 +- bench/stutter/stutter_invariance_formulas.cc | 18 +- .../stutter/stutter_invariance_randomgraph.cc | 24 +- configure.ac | 38 +-- debian/rules | 4 +- doc/Doxyfile.in | 8 +- doc/Makefile.am | 2 +- doc/org/.dir-locals.el.in | 4 +- doc/org/g++wrap.in | 4 +- doc/org/init.el.in | 4 +- doc/org/tut01.org | 30 +- doc/org/tut02.org | 6 +- doc/org/tut03.org | 16 +- doc/org/tut10.org | 8 +- doc/org/tut20.org | 4 +- doc/org/tut21.org | 6 +- doc/org/tut22.org | 4 +- doc/org/tut30.org | 6 +- iface/ltsmin/Makefile.am | 10 +- iface/ltsmin/kripke.test | 4 +- iface/ltsmin/ltsmin.cc | 12 +- iface/ltsmin/ltsmin.hh | 4 +- iface/ltsmin/modelcheck.cc | 24 +- {src => spot}/.gitignore | 0 {src => spot}/Makefile.am | 0 {src => spot}/bin/.gitignore | 0 {src => spot}/bin/Makefile.am | 2 +- {src => spot}/bin/README | 0 {src => spot}/bin/autfilt.cc | 42 +-- {src => spot}/bin/common_aoutput.cc | 16 +- {src => spot}/bin/common_aoutput.hh | 12 +- {src => spot}/bin/common_conv.cc | 0 {src => spot}/bin/common_conv.hh | 2 +- {src => spot}/bin/common_cout.cc | 0 {src => spot}/bin/common_cout.hh | 0 {src => spot}/bin/common_file.cc | 0 {src => spot}/bin/common_file.hh | 0 {src => spot}/bin/common_finput.cc | 0 {src => spot}/bin/common_finput.hh | 2 +- {src => spot}/bin/common_hoaread.cc | 0 {src => spot}/bin/common_hoaread.hh | 2 +- {src => spot}/bin/common_output.cc | 6 +- {src => spot}/bin/common_output.hh | 4 +- {src => spot}/bin/common_post.cc | 0 {src => spot}/bin/common_post.hh | 2 +- {src => spot}/bin/common_r.cc | 0 {src => spot}/bin/common_r.hh | 2 +- {src => spot}/bin/common_range.cc | 0 {src => spot}/bin/common_range.hh | 0 {src => spot}/bin/common_setup.cc | 2 +- {src => spot}/bin/common_setup.hh | 0 {src => spot}/bin/common_sys.hh | 0 {src => spot}/bin/common_trans.cc | 4 +- {src => spot}/bin/common_trans.hh | 6 +- {src => spot}/bin/dstar2tgba.cc | 22 +- {src => spot}/bin/genltl.cc | 4 +- {src => spot}/bin/ltl2tgba.cc | 10 +- {src => spot}/bin/ltl2tgta.cc | 22 +- {src => spot}/bin/ltlcross.cc | 50 ++-- {src => spot}/bin/ltldo.cc | 14 +- {src => spot}/bin/ltlfilt.cc | 26 +- {src => spot}/bin/ltlgrind.cc | 2 +- {src => spot}/bin/man/Makefile.am | 0 {src => spot}/bin/man/autfilt.x | 0 {src => spot}/bin/man/dstar2tgba.x | 0 {src => spot}/bin/man/genltl.x | 0 {src => spot}/bin/man/ltl2tgba.x | 0 {src => spot}/bin/man/ltl2tgta.x | 0 {src => spot}/bin/man/ltlcross.x | 0 {src => spot}/bin/man/ltldo.x | 0 {src => spot}/bin/man/ltlfilt.x | 0 {src => spot}/bin/man/ltlgrind.x | 0 {src => spot}/bin/man/randaut.x | 0 {src => spot}/bin/man/randltl.x | 0 {src => spot}/bin/man/spot-x.x | 0 {src => spot}/bin/options.py | 0 {src => spot}/bin/randaut.cc | 10 +- {src => spot}/bin/randltl.cc | 8 +- {src => spot}/bin/spot-x.cc | 0 {src => spot}/graph/Makefile.am | 3 +- {src => spot}/graph/graph.hh | 2 +- {src => spot}/graph/ngraph.hh | 2 +- {src => spot}/kripke/Makefile.am | 6 +- {src => spot}/kripke/fairkripke.cc | 2 +- {src => spot}/kripke/fairkripke.hh | 4 +- {src => spot}/kripke/fwd.hh | 0 {src => spot}/kripke/kripke.cc | 2 +- {src => spot}/kripke/kripke.hh | 2 +- {src => spot}/kripke/kripkegraph.hh | 6 +- {src => spot}/misc/.gitignore | 0 {src => spot}/misc/Makefile.am | 2 +- {src => spot}/misc/bareword.cc | 4 +- {src => spot}/misc/bareword.hh | 2 +- {src => spot}/misc/bddlt.hh | 0 {src => spot}/misc/bitvect.cc | 2 +- {src => spot}/misc/bitvect.hh | 2 +- {src => spot}/misc/casts.hh | 0 {src => spot}/misc/common.hh | 0 {src => spot}/misc/escape.cc | 2 +- {src => spot}/misc/escape.hh | 2 +- {src => spot}/misc/fixpool.hh | 0 {src => spot}/misc/formater.cc | 2 +- {src => spot}/misc/formater.hh | 2 +- {src => spot}/misc/hash.hh | 4 +- {src => spot}/misc/hashfunc.hh | 0 {src => spot}/misc/intvcmp2.cc | 4 +- {src => spot}/misc/intvcmp2.hh | 2 +- {src => spot}/misc/intvcomp.cc | 4 +- {src => spot}/misc/intvcomp.hh | 2 +- {src => spot}/misc/location.hh | 2 +- {src => spot}/misc/ltstr.hh | 0 {src => spot}/misc/memusage.cc | 2 +- {src => spot}/misc/memusage.hh | 2 +- {src => spot}/misc/minato.cc | 2 +- {src => spot}/misc/minato.hh | 2 +- {src => spot}/misc/mspool.hh | 2 +- {src => spot}/misc/optionmap.cc | 2 +- {src => spot}/misc/optionmap.hh | 2 +- {src => spot}/misc/position.hh | 0 {src => spot}/misc/random.cc | 2 +- {src => spot}/misc/random.hh | 2 +- {src => spot}/misc/satsolver.cc | 4 +- {src => spot}/misc/satsolver.hh | 4 +- {src => spot}/misc/timer.cc | 2 +- {src => spot}/misc/timer.hh | 4 +- {src => spot}/misc/tmpfile.cc | 2 +- {src => spot}/misc/tmpfile.hh | 4 +- {src => spot}/misc/version.cc | 4 +- {src => spot}/misc/version.hh | 2 +- {src => spot}/parseaut/.gitignore | 0 {src => spot}/parseaut/Makefile.am | 2 +- {src => spot}/parseaut/fmterror.cc | 2 +- {src => spot}/parseaut/parseaut.yy | 12 +- {src => spot}/parseaut/parsedecl.hh | 4 +- {src => spot}/parseaut/public.hh | 10 +- {src => spot}/parseaut/scanaut.ll | 4 +- {src => spot}/parsetl/.gitignore | 0 {src => spot}/parsetl/Makefile.am | 2 +- {src => spot}/parsetl/fmterror.cc | 2 +- {src => spot}/parsetl/parsedecl.hh | 4 +- {src => spot}/parsetl/parsetl.yy | 8 +- {src => spot}/parsetl/scantl.ll | 4 +- {src => spot}/priv/Makefile.am | 2 +- {src => spot}/priv/accmap.hh | 6 +- {src => spot}/priv/bddalloc.cc | 2 +- {src => spot}/priv/bddalloc.hh | 2 +- {src => spot}/priv/freelist.cc | 2 +- {src => spot}/priv/freelist.hh | 0 {src => spot}/priv/trim.cc | 2 +- {src => spot}/priv/trim.hh | 0 {src => spot}/sanity/.gitignore | 0 {src => spot}/sanity/80columns.test | 0 {src => spot}/sanity/Makefile.am | 8 +- {src => spot}/sanity/includes.test | 0 {src => spot}/sanity/ipynb.test | 0 {src => spot}/sanity/private.test | 0 {src => spot}/sanity/readme.test | 0 {src => spot}/sanity/style.test | 24 +- {src => spot}/ta/Makefile.am | 2 +- {src => spot}/ta/ta.cc | 2 +- {src => spot}/ta/ta.hh | 4 +- {src => spot}/ta/taexplicit.cc | 6 +- {src => spot}/ta/taexplicit.hh | 10 +- {src => spot}/ta/taproduct.cc | 4 +- {src => spot}/ta/taproduct.hh | 4 +- {src => spot}/ta/tgta.hh | 2 +- {src => spot}/ta/tgtaexplicit.cc | 6 +- {src => spot}/ta/tgtaexplicit.hh | 12 +- {src => spot}/ta/tgtaproduct.cc | 6 +- {src => spot}/ta/tgtaproduct.hh | 10 +- {src => spot}/taalgos/Makefile.am | 2 +- {src => spot}/taalgos/dot.cc | 10 +- {src => spot}/taalgos/dot.hh | 2 +- {src => spot}/taalgos/emptinessta.cc | 6 +- {src => spot}/taalgos/emptinessta.hh | 6 +- {src => spot}/taalgos/minimize.cc | 14 +- {src => spot}/taalgos/minimize.hh | 6 +- {src => spot}/taalgos/reachiter.cc | 2 +- {src => spot}/taalgos/reachiter.hh | 4 +- {src => spot}/taalgos/statessetbuilder.cc | 6 +- {src => spot}/taalgos/statessetbuilder.hh | 2 +- {src => spot}/taalgos/stats.cc | 6 +- {src => spot}/taalgos/stats.hh | 2 +- {src => spot}/taalgos/tgba2ta.cc | 10 +- {src => spot}/taalgos/tgba2ta.hh | 6 +- {src => spot}/tests/.gitignore | 0 {src => spot}/tests/Makefile.am | 2 +- {src => spot}/tests/acc.cc | 2 +- {src => spot}/tests/acc.test | 0 {src => spot}/tests/acc2.test | 0 {src => spot}/tests/babiak.test | 0 {src => spot}/tests/bare.test | 0 {src => spot}/tests/basimul.test | 0 {src => spot}/tests/bitvect.cc | 2 +- {src => spot}/tests/bitvect.test | 0 {src => spot}/tests/checkpsl.cc | 12 +- {src => spot}/tests/checkta.cc | 18 +- {src => spot}/tests/complement.test | 0 {src => spot}/tests/complementation.cc | 26 +- {src => spot}/tests/complementation.test | 0 {src => spot}/tests/complete.test | 0 {src => spot}/tests/consterm.cc | 2 +- {src => spot}/tests/consterm.test | 0 {src => spot}/tests/cycles.test | 0 {src => spot}/tests/dbacomp.test | 0 {src => spot}/tests/defs.in | 0 {src => spot}/tests/degendet.test | 0 {src => spot}/tests/degenid.test | 0 {src => spot}/tests/degenlskip.test | 0 {src => spot}/tests/det.test | 0 {src => spot}/tests/dfs.test | 0 {src => spot}/tests/dra2dba.test | 0 {src => spot}/tests/dstar.test | 0 {src => spot}/tests/dupexp.test | 0 {src => spot}/tests/emptchk.cc | 18 +- {src => spot}/tests/emptchk.test | 0 {src => spot}/tests/emptchke.test | 0 {src => spot}/tests/emptchkr.test | 0 {src => spot}/tests/equals.test | 0 {src => spot}/tests/equalsf.cc | 10 +- {src => spot}/tests/eventuniv.test | 0 {src => spot}/tests/exclusive-ltl.test | 0 {src => spot}/tests/exclusive-tgba.test | 0 {src => spot}/tests/explpro2.test | 0 {src => spot}/tests/explpro3.test | 0 {src => spot}/tests/explpro4.test | 0 {src => spot}/tests/explprod.test | 0 {src => spot}/tests/graph.cc | 2 +- {src => spot}/tests/graph.test | 0 {src => spot}/tests/ikwiad.cc | 82 +++--- {src => spot}/tests/intvcmp2.cc | 2 +- {src => spot}/tests/intvcomp.cc | 2 +- {src => spot}/tests/intvcomp.test | 0 {src => spot}/tests/isomorph.test | 0 {src => spot}/tests/isop.test | 0 {src => spot}/tests/kind.cc | 2 +- {src => spot}/tests/kind.test | 0 {src => spot}/tests/kripke.test | 0 {src => spot}/tests/latex.test | 0 {src => spot}/tests/lbt.test | 0 {src => spot}/tests/lbttparse.test | 0 {src => spot}/tests/length.cc | 4 +- {src => spot}/tests/length.test | 0 {src => spot}/tests/lenient.test | 0 {src => spot}/tests/ltl2dstar.test | 0 {src => spot}/tests/ltl2dstar2.test | 0 {src => spot}/tests/ltl2dstar3.test | 0 {src => spot}/tests/ltl2dstar4.test | 0 {src => spot}/tests/ltl2neverclaim-lbtt.test | 0 {src => spot}/tests/ltl2neverclaim.test | 0 {src => spot}/tests/ltl2ta.test | 0 {src => spot}/tests/ltl2ta2.test | 0 {src => spot}/tests/ltl2tgba.test | 0 {src => spot}/tests/ltl3dra.test | 0 {src => spot}/tests/ltlcounter.test | 0 {src => spot}/tests/ltlcross.test | 0 {src => spot}/tests/ltlcross2.test | 0 {src => spot}/tests/ltlcross3.test | 0 {src => spot}/tests/ltlcross4.test | 0 {src => spot}/tests/ltlcrossce.test | 0 {src => spot}/tests/ltlcrossce2.test | 0 {src => spot}/tests/ltlcrossgrind.test | 0 {src => spot}/tests/ltldo.test | 0 {src => spot}/tests/ltldo2.test | 0 {src => spot}/tests/ltlfilt.test | 0 {src => spot}/tests/ltlgrind.test | 0 {src => spot}/tests/ltlprod.cc | 8 +- {src => spot}/tests/ltlprod.test | 0 {src => spot}/tests/ltlrel.cc | 6 +- {src => spot}/tests/ltlrel.test | 0 {src => spot}/tests/lunabbrev.test | 0 {src => spot}/tests/maskacc.test | 0 {src => spot}/tests/maskkeep.test | 0 {src => spot}/tests/monitor.test | 0 {src => spot}/tests/nenoform.test | 0 {src => spot}/tests/neverclaimread.test | 0 {src => spot}/tests/ngraph.cc | 4 +- {src => spot}/tests/ngraph.test | 0 {src => spot}/tests/nondet.test | 0 {src => spot}/tests/obligation.test | 0 {src => spot}/tests/optba.test | 0 {src => spot}/tests/origin | 0 {src => spot}/tests/parse.test | 0 {src => spot}/tests/parse_print_test.cc | 4 +- {src => spot}/tests/parseaut.test | 0 {src => spot}/tests/parseerr.test | 0 {src => spot}/tests/prodor.test | 0 {src => spot}/tests/rand.test | 0 {src => spot}/tests/randaut.test | 0 {src => spot}/tests/randomize.test | 0 {src => spot}/tests/randpsl.test | 0 {src => spot}/tests/randtgba.cc | 38 +-- {src => spot}/tests/randtgba.test | 0 {src => spot}/tests/readltl.cc | 4 +- {src => spot}/tests/readsat.cc | 2 +- {src => spot}/tests/readsat.test | 0 {src => spot}/tests/readsave.test | 0 {src => spot}/tests/reduc.cc | 8 +- {src => spot}/tests/reduc.test | 0 {src => spot}/tests/reduc0.test | 0 {src => spot}/tests/reduccmp.test | 0 {src => spot}/tests/reducpsl.test | 0 {src => spot}/tests/remfin.test | 0 {src => spot}/tests/remove_x.test | 0 {src => spot}/tests/remprop.test | 0 {src => spot}/tests/renault.test | 0 {src => spot}/tests/satmin.test | 0 {src => spot}/tests/satmin2.test | 0 {src => spot}/tests/sbacc.test | 0 {src => spot}/tests/scc.test | 0 {src => spot}/tests/sccdot.test | 0 {src => spot}/tests/sccsimpl.test | 0 {src => spot}/tests/sepsets.test | 0 {src => spot}/tests/sim2.test | 0 {src => spot}/tests/sim3.test | 0 {src => spot}/tests/simdet.test | 0 {src => spot}/tests/spotlbtt.test | 0 {src => spot}/tests/spotlbtt2.test | 0 {src => spot}/tests/strength.test | 0 {src => spot}/tests/stutter-ltl.test | 0 {src => spot}/tests/stutter-tgba.test | 0 {src => spot}/tests/syntimpl.cc | 8 +- {src => spot}/tests/syntimpl.test | 0 {src => spot}/tests/taatgba.cc | 8 +- {src => spot}/tests/taatgba.test | 0 {src => spot}/tests/tgbagraph.test | 0 {src => spot}/tests/tostring.cc | 4 +- {src => spot}/tests/tostring.test | 0 {src => spot}/tests/tripprod.test | 0 {src => spot}/tests/tunabbrev.test | 0 {src => spot}/tests/tunenoform.test | 0 {src => spot}/tests/twagraph.cc | 6 +- {src => spot}/tests/unabbrevwm.test | 0 {src => spot}/tests/unambig.test | 0 {src => spot}/tests/uniq.test | 0 {src => spot}/tests/utf8.test | 0 {src => spot}/tests/uwrm.test | 0 {src => spot}/tests/wdba.test | 0 {src => spot}/tests/wdba2.test | 0 {src => spot}/tl/.gitignore | 0 {src => spot}/tl/Makefile.am | 2 +- {src => spot}/tl/apcollect.cc | 6 +- {src => spot}/tl/apcollect.hh | 4 +- {src => spot}/tl/contain.cc | 8 +- {src => spot}/tl/contain.hh | 6 +- {src => spot}/tl/declenv.cc | 2 +- {src => spot}/tl/declenv.hh | 4 +- {src => spot}/tl/defaultenv.cc | 2 +- {src => spot}/tl/defaultenv.hh | 4 +- {src => spot}/tl/dot.cc | 4 +- {src => spot}/tl/dot.hh | 2 +- {src => spot}/tl/environment.hh | 2 +- {src => spot}/tl/exclusive.cc | 10 +- {src => spot}/tl/exclusive.hh | 4 +- {src => spot}/tl/formula.cc | 8 +- {src => spot}/tl/formula.hh | 2 +- {src => spot}/tl/length.cc | 4 +- {src => spot}/tl/length.hh | 2 +- {src => spot}/tl/mark.cc | 2 +- {src => spot}/tl/mark.hh | 4 +- {src => spot}/tl/mutation.cc | 6 +- {src => spot}/tl/mutation.hh | 2 +- {src => spot}/tl/nenoform.cc | 4 +- {src => spot}/tl/nenoform.hh | 2 +- {src => spot}/tl/parse.hh | 6 +- {src => spot}/tl/print.cc | 6 +- {src => spot}/tl/print.hh | 2 +- {src => spot}/tl/randomltl.cc | 8 +- {src => spot}/tl/randomltl.hh | 8 +- {src => spot}/tl/relabel.cc | 4 +- {src => spot}/tl/relabel.hh | 4 +- {src => spot}/tl/remove_x.cc | 6 +- {src => spot}/tl/remove_x.hh | 2 +- {src => spot}/tl/simplify.cc | 10 +- {src => spot}/tl/simplify.hh | 4 +- {src => spot}/tl/snf.cc | 2 +- {src => spot}/tl/snf.hh | 2 +- {src => spot}/tl/unabbrev.cc | 2 +- {src => spot}/tl/unabbrev.hh | 2 +- {src => spot}/twa/.gitignore | 0 {src => spot}/twa/Makefile.am | 2 +- {src => spot}/twa/acc.cc | 8 +- {src => spot}/twa/acc.hh | 2 +- {src => spot}/twa/bdddict.cc | 10 +- {src => spot}/twa/bdddict.hh | 2 +- {src => spot}/twa/bddprint.cc | 8 +- {src => spot}/twa/bddprint.hh | 2 +- {src => spot}/twa/formula2bdd.cc | 4 +- {src => spot}/twa/formula2bdd.hh | 2 +- {src => spot}/twa/fwd.hh | 0 {src => spot}/twa/taatgba.cc | 6 +- {src => spot}/twa/taatgba.hh | 8 +- {src => spot}/twa/twa.cc | 8 +- {src => spot}/twa/twa.hh | 12 +- {src => spot}/twa/twagraph.cc | 4 +- {src => spot}/twa/twagraph.hh | 14 +- {src => spot}/twa/twaproduct.cc | 6 +- {src => spot}/twa/twaproduct.hh | 4 +- {src => spot}/twa/twasafracomplement.cc | 20 +- {src => spot}/twa/twasafracomplement.hh | 2 +- {src => spot}/twaalgos/.gitignore | 0 {src => spot}/twaalgos/Makefile.am | 2 +- {src => spot}/twaalgos/are_isomorphic.cc | 8 +- {src => spot}/twaalgos/are_isomorphic.hh | 2 +- {src => spot}/twaalgos/bfssteps.cc | 4 +- {src => spot}/twaalgos/bfssteps.hh | 2 +- {src => spot}/twaalgos/canonicalize.cc | 4 +- {src => spot}/twaalgos/canonicalize.hh | 2 +- {src => spot}/twaalgos/cleanacc.cc | 2 +- {src => spot}/twaalgos/cleanacc.hh | 2 +- {src => spot}/twaalgos/complement.cc | 8 +- {src => spot}/twaalgos/complement.hh | 2 +- {src => spot}/twaalgos/complete.cc | 2 +- {src => spot}/twaalgos/complete.hh | 2 +- {src => spot}/twaalgos/compsusp.cc | 20 +- {src => spot}/twaalgos/compsusp.hh | 4 +- {src => spot}/twaalgos/copy.cc | 8 +- {src => spot}/twaalgos/copy.hh | 6 +- {src => spot}/twaalgos/cycles.cc | 2 +- {src => spot}/twaalgos/cycles.hh | 4 +- {src => spot}/twaalgos/degen.cc | 12 +- {src => spot}/twaalgos/degen.hh | 2 +- {src => spot}/twaalgos/dot.cc | 18 +- {src => spot}/twaalgos/dot.hh | 4 +- {src => spot}/twaalgos/dtbasat.cc | 16 +- {src => spot}/twaalgos/dtbasat.hh | 2 +- {src => spot}/twaalgos/dtwasat.cc | 32 +-- {src => spot}/twaalgos/dtwasat.hh | 2 +- {src => spot}/twaalgos/emptiness.cc | 20 +- {src => spot}/twaalgos/emptiness.hh | 6 +- {src => spot}/twaalgos/emptiness_stats.hh | 2 +- {src => spot}/twaalgos/gtec/.gitignore | 0 {src => spot}/twaalgos/gtec/Makefile.am | 2 +- {src => spot}/twaalgos/gtec/ce.cc | 6 +- {src => spot}/twaalgos/gtec/ce.hh | 6 +- {src => spot}/twaalgos/gtec/gtec.cc | 6 +- {src => spot}/twaalgos/gtec/gtec.hh | 6 +- {src => spot}/twaalgos/gtec/sccstack.cc | 2 +- {src => spot}/twaalgos/gtec/sccstack.hh | 2 +- {src => spot}/twaalgos/gtec/status.cc | 2 +- {src => spot}/twaalgos/gtec/status.hh | 4 +- {src => spot}/twaalgos/gv04.cc | 12 +- {src => spot}/twaalgos/gv04.hh | 6 +- {src => spot}/twaalgos/hoa.cc | 18 +- {src => spot}/twaalgos/hoa.hh | 4 +- {src => spot}/twaalgos/isdet.cc | 2 +- {src => spot}/twaalgos/isdet.hh | 2 +- {src => spot}/twaalgos/isunamb.cc | 6 +- {src => spot}/twaalgos/isunamb.hh | 2 +- {src => spot}/twaalgos/isweakscc.cc | 6 +- {src => spot}/twaalgos/isweakscc.hh | 2 +- {src => spot}/twaalgos/lbtt.cc | 12 +- {src => spot}/twaalgos/lbtt.hh | 2 +- {src => spot}/twaalgos/ltl2taa.cc | 8 +- {src => spot}/twaalgos/ltl2taa.hh | 4 +- {src => spot}/twaalgos/ltl2tgba_fm.cc | 22 +- {src => spot}/twaalgos/ltl2tgba_fm.hh | 8 +- {src => spot}/twaalgos/magic.cc | 12 +- {src => spot}/twaalgos/magic.hh | 6 +- {src => spot}/twaalgos/mask.cc | 2 +- {src => spot}/twaalgos/mask.hh | 2 +- {src => spot}/twaalgos/minimize.cc | 28 +- {src => spot}/twaalgos/minimize.hh | 4 +- {src => spot}/twaalgos/ndfs_result.hxx | 12 +- {src => spot}/twaalgos/neverclaim.cc | 12 +- {src => spot}/twaalgos/neverclaim.hh | 4 +- {src => spot}/twaalgos/postproc.cc | 30 +- {src => spot}/twaalgos/postproc.hh | 2 +- {src => spot}/twaalgos/powerset.cc | 30 +- {src => spot}/twaalgos/powerset.hh | 2 +- {src => spot}/twaalgos/product.cc | 8 +- {src => spot}/twaalgos/product.hh | 4 +- {src => spot}/twaalgos/projrun.cc | 6 +- {src => spot}/twaalgos/projrun.hh | 6 +- {src => spot}/twaalgos/randomgraph.cc | 8 +- {src => spot}/twaalgos/randomgraph.hh | 8 +- {src => spot}/twaalgos/randomize.cc | 4 +- {src => spot}/twaalgos/randomize.hh | 2 +- {src => spot}/twaalgos/reachiter.cc | 2 +- {src => spot}/twaalgos/reachiter.hh | 4 +- {src => spot}/twaalgos/relabel.cc | 2 +- {src => spot}/twaalgos/relabel.hh | 4 +- {src => spot}/twaalgos/remfin.cc | 12 +- {src => spot}/twaalgos/remfin.hh | 2 +- {src => spot}/twaalgos/remprop.cc | 6 +- {src => spot}/twaalgos/remprop.hh | 4 +- {src => spot}/twaalgos/sbacc.cc | 2 +- {src => spot}/twaalgos/sbacc.hh | 2 +- {src => spot}/twaalgos/sccfilter.cc | 6 +- {src => spot}/twaalgos/sccfilter.hh | 4 +- {src => spot}/twaalgos/sccinfo.cc | 8 +- {src => spot}/twaalgos/sccinfo.hh | 2 +- {src => spot}/twaalgos/se05.cc | 12 +- {src => spot}/twaalgos/se05.hh | 6 +- {src => spot}/twaalgos/sepsets.cc | 4 +- {src => spot}/twaalgos/sepsets.hh | 2 +- {src => spot}/twaalgos/simulation.cc | 16 +- {src => spot}/twaalgos/simulation.hh | 4 +- {src => spot}/twaalgos/stats.cc | 12 +- {src => spot}/twaalgos/stats.hh | 4 +- {src => spot}/twaalgos/strength.cc | 8 +- {src => spot}/twaalgos/strength.hh | 2 +- {src => spot}/twaalgos/stripacc.cc | 4 +- {src => spot}/twaalgos/stripacc.hh | 2 +- {src => spot}/twaalgos/stutter.cc | 28 +- {src => spot}/twaalgos/stutter.hh | 2 +- {src => spot}/twaalgos/tau03.cc | 12 +- {src => spot}/twaalgos/tau03.hh | 6 +- {src => spot}/twaalgos/tau03opt.cc | 14 +- {src => spot}/twaalgos/tau03opt.hh | 6 +- {src => spot}/twaalgos/totgba.cc | 10 +- {src => spot}/twaalgos/totgba.hh | 2 +- {src => spot}/twaalgos/translate.cc | 8 +- {src => spot}/twaalgos/translate.hh | 4 +- {src => spot}/twaalgos/weight.cc | 2 +- {src => spot}/twaalgos/weight.hh | 2 +- {src => spot}/twaalgos/word.cc | 6 +- {src => spot}/twaalgos/word.hh | 2 +- wrap/python/Makefile.am | 6 +- wrap/python/ajax/spotcgi.in | 2 +- wrap/python/spot_impl.i | 262 +++++++++--------- wrap/python/tests/ltl2tgba.py | 5 +- wrap/python/tests/randgen.py | 3 - wrap/python/tests/run.in | 4 +- 529 files changed, 1308 insertions(+), 1262 deletions(-) rename {src => spot}/.gitignore (100%) rename {src => spot}/Makefile.am (100%) rename {src => spot}/bin/.gitignore (100%) rename {src => spot}/bin/Makefile.am (96%) rename {src => spot}/bin/README (100%) rename {src => spot}/bin/autfilt.cc (96%) rename {src => spot}/bin/common_aoutput.cc (97%) rename {src => spot}/bin/common_aoutput.hh (96%) rename {src => spot}/bin/common_conv.cc (100%) rename {src => spot}/bin/common_conv.hh (97%) rename {src => spot}/bin/common_cout.cc (100%) rename {src => spot}/bin/common_cout.hh (100%) rename {src => spot}/bin/common_file.cc (100%) rename {src => spot}/bin/common_file.hh (100%) rename {src => spot}/bin/common_finput.cc (100%) rename {src => spot}/bin/common_finput.hh (98%) rename {src => spot}/bin/common_hoaread.cc (100%) rename {src => spot}/bin/common_hoaread.hh (96%) rename {src => spot}/bin/common_output.cc (98%) rename {src => spot}/bin/common_output.hh (97%) rename {src => spot}/bin/common_post.cc (100%) rename {src => spot}/bin/common_post.hh (97%) rename {src => spot}/bin/common_r.cc (100%) rename {src => spot}/bin/common_r.hh (98%) rename {src => spot}/bin/common_range.cc (100%) rename {src => spot}/bin/common_range.hh (100%) rename {src => spot}/bin/common_setup.cc (99%) rename {src => spot}/bin/common_setup.hh (100%) rename {src => spot}/bin/common_sys.hh (100%) rename {src => spot}/bin/common_trans.cc (99%) rename {src => spot}/bin/common_trans.hh (97%) rename {src => spot}/bin/dstar2tgba.cc (92%) rename {src => spot}/bin/genltl.cc (99%) rename {src => spot}/bin/ltl2tgba.cc (96%) rename {src => spot}/bin/ltl2tgta.cc (94%) rename {src => spot}/bin/ltlcross.cc (97%) rename {src => spot}/bin/ltldo.cc (97%) rename {src => spot}/bin/ltlfilt.cc (97%) rename {src => spot}/bin/ltlgrind.cc (99%) rename {src => spot}/bin/man/Makefile.am (100%) rename {src => spot}/bin/man/autfilt.x (100%) rename {src => spot}/bin/man/dstar2tgba.x (100%) rename {src => spot}/bin/man/genltl.x (100%) rename {src => spot}/bin/man/ltl2tgba.x (100%) rename {src => spot}/bin/man/ltl2tgta.x (100%) rename {src => spot}/bin/man/ltlcross.x (100%) rename {src => spot}/bin/man/ltldo.x (100%) rename {src => spot}/bin/man/ltlfilt.x (100%) rename {src => spot}/bin/man/ltlgrind.x (100%) rename {src => spot}/bin/man/randaut.x (100%) rename {src => spot}/bin/man/randltl.x (100%) rename {src => spot}/bin/man/spot-x.x (100%) rename {src => spot}/bin/options.py (100%) rename {src => spot}/bin/randaut.cc (98%) rename {src => spot}/bin/randltl.cc (98%) rename {src => spot}/bin/spot-x.cc (100%) rename {src => spot}/graph/Makefile.am (95%) rename {src => spot}/graph/graph.hh (99%) rename {src => spot}/graph/ngraph.hh (99%) rename {src => spot}/kripke/Makefile.am (84%) rename {src => spot}/kripke/fairkripke.cc (97%) rename {src => spot}/kripke/fairkripke.hh (98%) rename {src => spot}/kripke/fwd.hh (100%) rename {src => spot}/kripke/kripke.cc (97%) rename {src => spot}/kripke/kripke.hh (98%) rename {src => spot}/kripke/kripkegraph.hh (98%) rename {src => spot}/misc/.gitignore (100%) rename {src => spot}/misc/Makefile.am (96%) rename {src => spot}/misc/bareword.cc (96%) rename {src => spot}/misc/bareword.hh (98%) rename {src => spot}/misc/bddlt.hh (100%) rename {src => spot}/misc/bitvect.cc (99%) rename {src => spot}/misc/bitvect.hh (99%) rename {src => spot}/misc/casts.hh (100%) rename {src => spot}/misc/common.hh (100%) rename {src => spot}/misc/escape.cc (98%) rename {src => spot}/misc/escape.hh (98%) rename {src => spot}/misc/fixpool.hh (100%) rename {src => spot}/misc/formater.cc (97%) rename {src => spot}/misc/formater.hh (99%) rename {src => spot}/misc/hash.hh (97%) rename {src => spot}/misc/hashfunc.hh (100%) rename {src => spot}/misc/intvcmp2.cc (99%) rename {src => spot}/misc/intvcmp2.hh (98%) rename {src => spot}/misc/intvcomp.cc (99%) rename {src => spot}/misc/intvcomp.hh (98%) rename {src => spot}/misc/location.hh (99%) rename {src => spot}/misc/ltstr.hh (100%) rename {src => spot}/misc/memusage.cc (97%) rename {src => spot}/misc/memusage.hh (97%) rename {src => spot}/misc/minato.cc (99%) rename {src => spot}/misc/minato.hh (99%) rename {src => spot}/misc/mspool.hh (99%) rename {src => spot}/misc/optionmap.cc (99%) rename {src => spot}/misc/optionmap.hh (99%) rename {src => spot}/misc/position.hh (100%) rename {src => spot}/misc/random.cc (98%) rename {src => spot}/misc/random.hh (99%) rename {src => spot}/misc/satsolver.cc (98%) rename {src => spot}/misc/satsolver.hh (97%) rename {src => spot}/misc/timer.cc (99%) rename {src => spot}/misc/timer.hh (98%) rename {src => spot}/misc/tmpfile.cc (99%) rename {src => spot}/misc/tmpfile.hh (98%) rename {src => spot}/misc/version.cc (94%) rename {src => spot}/misc/version.hh (97%) rename {src => spot}/parseaut/.gitignore (100%) rename {src => spot}/parseaut/Makefile.am (95%) rename {src => spot}/parseaut/fmterror.cc (97%) rename {src => spot}/parseaut/parseaut.yy (99%) rename {src => spot}/parseaut/parsedecl.hh (94%) rename {src => spot}/parseaut/public.hh (97%) rename {src => spot}/parseaut/scanaut.ll (99%) rename {src => spot}/parsetl/.gitignore (100%) rename {src => spot}/parsetl/Makefile.am (96%) rename {src => spot}/parsetl/fmterror.cc (99%) rename {src => spot}/parsetl/parsedecl.hh (94%) rename {src => spot}/parsetl/parsetl.yy (99%) rename {src => spot}/parsetl/scantl.ll (99%) rename {src => spot}/priv/Makefile.am (93%) rename {src => spot}/priv/accmap.hh (97%) rename {src => spot}/priv/bddalloc.cc (98%) rename {src => spot}/priv/bddalloc.hh (98%) rename {src => spot}/priv/freelist.cc (99%) rename {src => spot}/priv/freelist.hh (100%) rename {src => spot}/priv/trim.cc (97%) rename {src => spot}/priv/trim.hh (100%) rename {src => spot}/sanity/.gitignore (100%) rename {src => spot}/sanity/80columns.test (100%) rename {src => spot}/sanity/Makefile.am (93%) rename {src => spot}/sanity/includes.test (100%) rename {src => spot}/sanity/ipynb.test (100%) rename {src => spot}/sanity/private.test (100%) rename {src => spot}/sanity/readme.test (100%) rename {src => spot}/sanity/style.test (93%) rename {src => spot}/ta/Makefile.am (94%) rename {src => spot}/ta/ta.cc (98%) rename {src => spot}/ta/ta.hh (99%) rename {src => spot}/ta/taexplicit.cc (99%) rename {src => spot}/ta/taexplicit.hh (97%) rename {src => spot}/ta/taproduct.cc (99%) rename {src => spot}/ta/taproduct.hh (98%) rename {src => spot}/ta/tgta.hh (99%) rename {src => spot}/ta/tgtaexplicit.cc (94%) rename {src => spot}/ta/tgtaexplicit.hh (92%) rename {src => spot}/ta/tgtaproduct.cc (98%) rename {src => spot}/ta/tgtaproduct.hh (94%) rename {src => spot}/taalgos/Makefile.am (94%) rename {src => spot}/taalgos/dot.cc (97%) rename {src => spot}/taalgos/dot.hh (97%) rename {src => spot}/taalgos/emptinessta.cc (99%) rename {src => spot}/taalgos/emptinessta.hh (98%) rename {src => spot}/taalgos/minimize.cc (98%) rename {src => spot}/taalgos/minimize.hh (96%) rename {src => spot}/taalgos/reachiter.cc (99%) rename {src => spot}/taalgos/reachiter.hh (98%) rename {src => spot}/taalgos/statessetbuilder.cc (93%) rename {src => spot}/taalgos/statessetbuilder.hh (97%) rename {src => spot}/taalgos/stats.cc (95%) rename {src => spot}/taalgos/stats.hh (97%) rename {src => spot}/taalgos/tgba2ta.cc (99%) rename {src => spot}/taalgos/tgba2ta.hh (97%) rename {src => spot}/tests/.gitignore (100%) rename {src => spot}/tests/Makefile.am (98%) rename {src => spot}/tests/acc.cc (99%) rename {src => spot}/tests/acc.test (100%) rename {src => spot}/tests/acc2.test (100%) rename {src => spot}/tests/babiak.test (100%) rename {src => spot}/tests/bare.test (100%) rename {src => spot}/tests/basimul.test (100%) rename {src => spot}/tests/bitvect.cc (98%) rename {src => spot}/tests/bitvect.test (100%) rename {src => spot}/tests/checkpsl.cc (92%) rename {src => spot}/tests/checkta.cc (95%) rename {src => spot}/tests/complement.test (100%) rename {src => spot}/tests/complementation.cc (93%) rename {src => spot}/tests/complementation.test (100%) rename {src => spot}/tests/complete.test (100%) rename {src => spot}/tests/consterm.cc (98%) rename {src => spot}/tests/consterm.test (100%) rename {src => spot}/tests/cycles.test (100%) rename {src => spot}/tests/dbacomp.test (100%) rename {src => spot}/tests/defs.in (100%) rename {src => spot}/tests/degendet.test (100%) rename {src => spot}/tests/degenid.test (100%) rename {src => spot}/tests/degenlskip.test (100%) rename {src => spot}/tests/det.test (100%) rename {src => spot}/tests/dfs.test (100%) rename {src => spot}/tests/dra2dba.test (100%) rename {src => spot}/tests/dstar.test (100%) rename {src => spot}/tests/dupexp.test (100%) rename {src => spot}/tests/emptchk.cc (93%) rename {src => spot}/tests/emptchk.test (100%) rename {src => spot}/tests/emptchke.test (100%) rename {src => spot}/tests/emptchkr.test (100%) rename {src => spot}/tests/equals.test (100%) rename {src => spot}/tests/equalsf.cc (97%) rename {src => spot}/tests/eventuniv.test (100%) rename {src => spot}/tests/exclusive-ltl.test (100%) rename {src => spot}/tests/exclusive-tgba.test (100%) rename {src => spot}/tests/explpro2.test (100%) rename {src => spot}/tests/explpro3.test (100%) rename {src => spot}/tests/explpro4.test (100%) rename {src => spot}/tests/explprod.test (100%) rename {src => spot}/tests/graph.cc (99%) rename {src => spot}/tests/graph.test (100%) rename {src => spot}/tests/ikwiad.cc (96%) rename {src => spot}/tests/intvcmp2.cc (99%) rename {src => spot}/tests/intvcomp.cc (99%) rename {src => spot}/tests/intvcomp.test (100%) rename {src => spot}/tests/isomorph.test (100%) rename {src => spot}/tests/isop.test (100%) rename {src => spot}/tests/kind.cc (98%) rename {src => spot}/tests/kind.test (100%) rename {src => spot}/tests/kripke.test (100%) rename {src => spot}/tests/latex.test (100%) rename {src => spot}/tests/lbt.test (100%) rename {src => spot}/tests/lbttparse.test (100%) rename {src => spot}/tests/length.cc (96%) rename {src => spot}/tests/length.test (100%) rename {src => spot}/tests/lenient.test (100%) rename {src => spot}/tests/ltl2dstar.test (100%) rename {src => spot}/tests/ltl2dstar2.test (100%) rename {src => spot}/tests/ltl2dstar3.test (100%) rename {src => spot}/tests/ltl2dstar4.test (100%) rename {src => spot}/tests/ltl2neverclaim-lbtt.test (100%) rename {src => spot}/tests/ltl2neverclaim.test (100%) rename {src => spot}/tests/ltl2ta.test (100%) rename {src => spot}/tests/ltl2ta2.test (100%) rename {src => spot}/tests/ltl2tgba.test (100%) rename {src => spot}/tests/ltl3dra.test (100%) rename {src => spot}/tests/ltlcounter.test (100%) rename {src => spot}/tests/ltlcross.test (100%) rename {src => spot}/tests/ltlcross2.test (100%) rename {src => spot}/tests/ltlcross3.test (100%) rename {src => spot}/tests/ltlcross4.test (100%) rename {src => spot}/tests/ltlcrossce.test (100%) rename {src => spot}/tests/ltlcrossce2.test (100%) rename {src => spot}/tests/ltlcrossgrind.test (100%) rename {src => spot}/tests/ltldo.test (100%) rename {src => spot}/tests/ltldo2.test (100%) rename {src => spot}/tests/ltlfilt.test (100%) rename {src => spot}/tests/ltlgrind.test (100%) rename {src => spot}/tests/ltlprod.cc (93%) rename {src => spot}/tests/ltlprod.test (100%) rename {src => spot}/tests/ltlrel.cc (95%) rename {src => spot}/tests/ltlrel.test (100%) rename {src => spot}/tests/lunabbrev.test (100%) rename {src => spot}/tests/maskacc.test (100%) rename {src => spot}/tests/maskkeep.test (100%) rename {src => spot}/tests/monitor.test (100%) rename {src => spot}/tests/nenoform.test (100%) rename {src => spot}/tests/neverclaimread.test (100%) rename {src => spot}/tests/ngraph.cc (99%) rename {src => spot}/tests/ngraph.test (100%) rename {src => spot}/tests/nondet.test (100%) rename {src => spot}/tests/obligation.test (100%) rename {src => spot}/tests/optba.test (100%) rename {src => spot}/tests/origin (100%) rename {src => spot}/tests/parse.test (100%) rename {src => spot}/tests/parse_print_test.cc (95%) rename {src => spot}/tests/parseaut.test (100%) rename {src => spot}/tests/parseerr.test (100%) rename {src => spot}/tests/prodor.test (100%) rename {src => spot}/tests/rand.test (100%) rename {src => spot}/tests/randaut.test (100%) rename {src => spot}/tests/randomize.test (100%) rename {src => spot}/tests/randpsl.test (100%) rename {src => spot}/tests/randtgba.cc (98%) rename {src => spot}/tests/randtgba.test (100%) rename {src => spot}/tests/readltl.cc (97%) rename {src => spot}/tests/readsat.cc (96%) rename {src => spot}/tests/readsat.test (100%) rename {src => spot}/tests/readsave.test (100%) rename {src => spot}/tests/reduc.cc (98%) rename {src => spot}/tests/reduc.test (100%) rename {src => spot}/tests/reduc0.test (100%) rename {src => spot}/tests/reduccmp.test (100%) rename {src => spot}/tests/reducpsl.test (100%) rename {src => spot}/tests/remfin.test (100%) rename {src => spot}/tests/remove_x.test (100%) rename {src => spot}/tests/remprop.test (100%) rename {src => spot}/tests/renault.test (100%) rename {src => spot}/tests/satmin.test (100%) rename {src => spot}/tests/satmin2.test (100%) rename {src => spot}/tests/sbacc.test (100%) rename {src => spot}/tests/scc.test (100%) rename {src => spot}/tests/sccdot.test (100%) rename {src => spot}/tests/sccsimpl.test (100%) rename {src => spot}/tests/sepsets.test (100%) rename {src => spot}/tests/sim2.test (100%) rename {src => spot}/tests/sim3.test (100%) rename {src => spot}/tests/simdet.test (100%) rename {src => spot}/tests/spotlbtt.test (100%) rename {src => spot}/tests/spotlbtt2.test (100%) rename {src => spot}/tests/strength.test (100%) rename {src => spot}/tests/stutter-ltl.test (100%) rename {src => spot}/tests/stutter-tgba.test (100%) rename {src => spot}/tests/syntimpl.cc (95%) rename {src => spot}/tests/syntimpl.test (100%) rename {src => spot}/tests/taatgba.cc (92%) rename {src => spot}/tests/taatgba.test (100%) rename {src => spot}/tests/tgbagraph.test (100%) rename {src => spot}/tests/tostring.cc (97%) rename {src => spot}/tests/tostring.test (100%) rename {src => spot}/tests/tripprod.test (100%) rename {src => spot}/tests/tunabbrev.test (100%) rename {src => spot}/tests/tunenoform.test (100%) rename {src => spot}/tests/twagraph.cc (96%) rename {src => spot}/tests/unabbrevwm.test (100%) rename {src => spot}/tests/unambig.test (100%) rename {src => spot}/tests/uniq.test (100%) rename {src => spot}/tests/utf8.test (100%) rename {src => spot}/tests/uwrm.test (100%) rename {src => spot}/tests/wdba.test (100%) rename {src => spot}/tests/wdba2.test (100%) rename {src => spot}/tl/.gitignore (100%) rename {src => spot}/tl/Makefile.am (96%) rename {src => spot}/tl/apcollect.cc (95%) rename {src => spot}/tl/apcollect.hh (97%) rename {src => spot}/tl/contain.cc (96%) rename {src => spot}/tl/contain.hh (96%) rename {src => spot}/tl/declenv.cc (98%) rename {src => spot}/tl/declenv.hh (96%) rename {src => spot}/tl/defaultenv.cc (97%) rename {src => spot}/tl/defaultenv.hh (96%) rename {src => spot}/tl/dot.cc (98%) rename {src => spot}/tl/dot.hh (97%) rename {src => spot}/tl/environment.hh (98%) rename {src => spot}/tl/exclusive.cc (96%) rename {src => spot}/tl/exclusive.hh (95%) rename {src => spot}/tl/formula.cc (99%) rename {src => spot}/tl/formula.hh (99%) rename {src => spot}/tl/length.cc (96%) rename {src => spot}/tl/length.hh (98%) rename {src => spot}/tl/mark.cc (99%) rename {src => spot}/tl/mark.hh (95%) rename {src => spot}/tl/mutation.cc (98%) rename {src => spot}/tl/mutation.hh (97%) rename {src => spot}/tl/nenoform.cc (95%) rename {src => spot}/tl/nenoform.hh (98%) rename {src => spot}/tl/parse.hh (98%) rename {src => spot}/tl/print.cc (99%) rename {src => spot}/tl/print.hh (99%) rename {src => spot}/tl/randomltl.cc (99%) rename {src => spot}/tl/randomltl.hh (98%) rename {src => spot}/tl/relabel.cc (99%) rename {src => spot}/tl/relabel.hh (96%) rename {src => spot}/tl/remove_x.cc (96%) rename {src => spot}/tl/remove_x.hh (98%) rename {src => spot}/tl/simplify.cc (99%) rename {src => spot}/tl/simplify.hh (99%) rename {src => spot}/tl/snf.cc (99%) rename {src => spot}/tl/snf.hh (98%) rename {src => spot}/tl/unabbrev.cc (99%) rename {src => spot}/tl/unabbrev.hh (98%) rename {src => spot}/twa/.gitignore (100%) rename {src => spot}/twa/Makefile.am (95%) rename {src => spot}/twa/acc.cc (99%) rename {src => spot}/twa/acc.hh (99%) rename {src => spot}/twa/bdddict.cc (98%) rename {src => spot}/twa/bdddict.hh (99%) rename {src => spot}/twa/bddprint.cc (97%) rename {src => spot}/twa/bddprint.hh (99%) rename {src => spot}/twa/formula2bdd.cc (98%) rename {src => spot}/twa/formula2bdd.hh (98%) rename {src => spot}/twa/fwd.hh (100%) rename {src => spot}/twa/taatgba.cc (98%) rename {src => spot}/twa/taatgba.hh (98%) rename {src => spot}/twa/twa.cc (95%) rename {src => spot}/twa/twa.hh (99%) rename {src => spot}/twa/twagraph.cc (99%) rename {src => spot}/twa/twagraph.hh (98%) rename {src => spot}/twa/twaproduct.cc (99%) rename {src => spot}/twa/twaproduct.hh (98%) rename {src => spot}/twa/twasafracomplement.cc (99%) rename {src => spot}/twa/twasafracomplement.hh (99%) rename {src => spot}/twaalgos/.gitignore (100%) rename {src => spot}/twaalgos/Makefile.am (97%) rename {src => spot}/twaalgos/are_isomorphic.cc (96%) rename {src => spot}/twaalgos/are_isomorphic.hh (98%) rename {src => spot}/twaalgos/bfssteps.cc (97%) rename {src => spot}/twaalgos/bfssteps.hh (99%) rename {src => spot}/twaalgos/canonicalize.cc (97%) rename {src => spot}/twaalgos/canonicalize.hh (97%) rename {src => spot}/twaalgos/cleanacc.cc (98%) rename {src => spot}/twaalgos/cleanacc.hh (97%) rename {src => spot}/twaalgos/complement.cc (88%) rename {src => spot}/twaalgos/complement.hh (97%) rename {src => spot}/twaalgos/complete.cc (99%) rename {src => spot}/twaalgos/complete.hh (97%) rename {src => spot}/twaalgos/compsusp.cc (96%) rename {src => spot}/twaalgos/compsusp.hh (97%) rename {src => spot}/twaalgos/copy.cc (94%) rename {src => spot}/twaalgos/copy.hh (93%) rename {src => spot}/twaalgos/cycles.cc (98%) rename {src => spot}/twaalgos/cycles.hh (98%) rename {src => spot}/twaalgos/degen.cc (98%) rename {src => spot}/twaalgos/degen.hh (98%) rename {src => spot}/twaalgos/dot.cc (97%) rename {src => spot}/twaalgos/dot.hh (96%) rename {src => spot}/twaalgos/dtbasat.cc (98%) rename {src => spot}/twaalgos/dtbasat.hh (98%) rename {src => spot}/twaalgos/dtwasat.cc (98%) rename {src => spot}/twaalgos/dtwasat.hh (99%) rename {src => spot}/twaalgos/emptiness.cc (98%) rename {src => spot}/twaalgos/emptiness.hh (99%) rename {src => spot}/twaalgos/emptiness_stats.hh (99%) rename {src => spot}/twaalgos/gtec/.gitignore (100%) rename {src => spot}/twaalgos/gtec/Makefile.am (94%) rename {src => spot}/twaalgos/gtec/ce.cc (98%) rename {src => spot}/twaalgos/gtec/ce.hh (93%) rename {src => spot}/twaalgos/gtec/gtec.cc (99%) rename {src => spot}/twaalgos/gtec/gtec.hh (98%) rename {src => spot}/twaalgos/gtec/sccstack.cc (97%) rename {src => spot}/twaalgos/gtec/sccstack.hh (98%) rename {src => spot}/twaalgos/gtec/status.cc (97%) rename {src => spot}/twaalgos/gtec/status.hh (96%) rename {src => spot}/twaalgos/gv04.cc (97%) rename {src => spot}/twaalgos/gv04.hh (95%) rename {src => spot}/twaalgos/hoa.cc (98%) rename {src => spot}/twaalgos/hoa.hh (96%) rename {src => spot}/twaalgos/isdet.cc (98%) rename {src => spot}/twaalgos/isdet.hh (98%) rename {src => spot}/twaalgos/isunamb.cc (92%) rename {src => spot}/twaalgos/isunamb.hh (97%) rename {src => spot}/twaalgos/isweakscc.cc (96%) rename {src => spot}/twaalgos/isweakscc.hh (98%) rename {src => spot}/twaalgos/lbtt.cc (95%) rename {src => spot}/twaalgos/lbtt.hh (98%) rename {src => spot}/twaalgos/ltl2taa.cc (98%) rename {src => spot}/twaalgos/ltl2taa.hh (96%) rename {src => spot}/twaalgos/ltl2tgba_fm.cc (99%) rename {src => spot}/twaalgos/ltl2tgba_fm.hh (98%) rename {src => spot}/twaalgos/magic.cc (98%) rename {src => spot}/twaalgos/magic.hh (97%) rename {src => spot}/twaalgos/mask.cc (98%) rename {src => spot}/twaalgos/mask.hh (99%) rename {src => spot}/twaalgos/minimize.cc (97%) rename {src => spot}/twaalgos/minimize.hh (99%) rename {src => spot}/twaalgos/ndfs_result.hxx (99%) rename {src => spot}/twaalgos/neverclaim.cc (96%) rename {src => spot}/twaalgos/neverclaim.hh (96%) rename {src => spot}/twaalgos/postproc.cc (95%) rename {src => spot}/twaalgos/postproc.hh (99%) rename {src => spot}/twaalgos/powerset.cc (95%) rename {src => spot}/twaalgos/powerset.hh (99%) rename {src => spot}/twaalgos/product.cc (97%) rename {src => spot}/twaalgos/product.hh (96%) rename {src => spot}/twaalgos/projrun.cc (93%) rename {src => spot}/twaalgos/projrun.hh (94%) rename {src => spot}/twaalgos/randomgraph.cc (98%) rename {src => spot}/twaalgos/randomgraph.hh (97%) rename {src => spot}/twaalgos/randomize.cc (96%) rename {src => spot}/twaalgos/randomize.hh (97%) rename {src => spot}/twaalgos/reachiter.cc (99%) rename {src => spot}/twaalgos/reachiter.hh (99%) rename {src => spot}/twaalgos/relabel.cc (97%) rename {src => spot}/twaalgos/relabel.hh (94%) rename {src => spot}/twaalgos/remfin.cc (99%) rename {src => spot}/twaalgos/remfin.hh (96%) rename {src => spot}/twaalgos/remprop.cc (97%) rename {src => spot}/twaalgos/remprop.hh (95%) rename {src => spot}/twaalgos/sbacc.cc (98%) rename {src => spot}/twaalgos/sbacc.hh (96%) rename {src => spot}/twaalgos/sccfilter.cc (99%) rename {src => spot}/twaalgos/sccfilter.hh (98%) rename {src => spot}/twaalgos/sccinfo.cc (98%) rename {src => spot}/twaalgos/sccinfo.hh (99%) rename {src => spot}/twaalgos/se05.cc (98%) rename {src => spot}/twaalgos/se05.hh (97%) rename {src => spot}/twaalgos/sepsets.cc (97%) rename {src => spot}/twaalgos/sepsets.hh (97%) rename {src => spot}/twaalgos/simulation.cc (98%) rename {src => spot}/twaalgos/simulation.hh (98%) rename {src => spot}/twaalgos/stats.cc (96%) rename {src => spot}/twaalgos/stats.hh (98%) rename {src => spot}/twaalgos/strength.cc (97%) rename {src => spot}/twaalgos/strength.hh (99%) rename {src => spot}/twaalgos/stripacc.cc (93%) rename {src => spot}/twaalgos/stripacc.hh (97%) rename {src => spot}/twaalgos/stutter.cc (97%) rename {src => spot}/twaalgos/stutter.hh (98%) rename {src => spot}/twaalgos/tau03.cc (98%) rename {src => spot}/twaalgos/tau03.hh (96%) rename {src => spot}/twaalgos/tau03opt.cc (98%) rename {src => spot}/twaalgos/tau03opt.hh (97%) rename {src => spot}/twaalgos/totgba.cc (98%) rename {src => spot}/twaalgos/totgba.hh (97%) rename {src => spot}/twaalgos/translate.cc (95%) rename {src => spot}/twaalgos/translate.hh (98%) rename {src => spot}/twaalgos/weight.cc (98%) rename {src => spot}/twaalgos/weight.hh (98%) rename {src => spot}/twaalgos/word.cc (96%) rename {src => spot}/twaalgos/word.hh (97%) diff --git a/.gitignore b/.gitignore index 1a64160b5..530225abd 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,7 @@ cachegrind.* ltdl config.h config.h.in -src/src/misc/_config.h +spot/misc/_config.h _configs.sed stamp-h1 *.trs @@ -78,4 +78,3 @@ GTAGS *.deb *.changes *.dsc - diff --git a/HACKING b/HACKING index 5fd31b629..0f00de8d6 100644 --- a/HACKING +++ b/HACKING @@ -283,6 +283,26 @@ Encoding In emacs the simplest way to convert the file is to add a comment with -*- coding: utf-8 -*- at the top or bottom of the file. +Includes +-------- + + * Use #include with angle-brackets to refer to public headers + of Spot; i.e., those that will be installed, or system + headers that are already installed. E.g., + + #include + #include + + * Use #include with double quotes to refer to private headers. + Those can be from Spot, or from third-party libraries that + we ship. E.g., + + #include "utf8/utf8.hh" + #include "spot/priv/trim.hh" + #include "config.h" + + This style of #include should never occur in public headers. + Exporting symbols ----------------- diff --git a/Makefile.am b/Makefile.am index 5c035e992..c02cd3836 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ if NEVER NEVER_SUBDIRS = bench elisp endif -SUBDIRS = buddy lib src wrap ltdl iface doc $(NEVER_SUBDIRS) +SUBDIRS = buddy lib spot wrap ltdl iface doc $(NEVER_SUBDIRS) UTF8 = utf8/doc/ReleaseNotes utf8/doc/utf8cpp.html utf8/utf8.h \ utf8/utf8/checked.h utf8/utf8/core.h utf8/utf8/unchecked.h diff --git a/NEWS b/NEWS index 1aebe59a7..1e89b5d5f 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,22 @@ New in spot 1.99.6a (not yet released) Library: + * Installed headers now assume that they will be included as + #include + instead of + #include + + This implies that when Spot headers are installed in + /usr/include/spot/... (the default when using the Debian packages) + or /usr/local/include/spot/... (the default when compiling from + source), then it is no longuer necessary to add + -I/usr/include/spot or -I/usr/local/include/spot when compiling. + + Inside the source distribution, the subdirectory src/ has been + renamed to spot/, so that the root of the source tree can also be + put on the preprocessor's search path to compile against a + non-installed version of Spot. + Python: Bug fixes: diff --git a/README b/README index 00e04aed5..3cb83cce2 100644 --- a/README +++ b/README @@ -122,7 +122,7 @@ Some documentation can be found in the doc/ directory. logic operators supported by Spot "make install" will install man pages for command-line tools. (These -man pages can also be found in the src/bin/man/ subdirectory of the +man pages can also be found in the spot/bin/man/ subdirectory of the source tree.) Additional documentation about these tools can be found in doc/userdoc/, or on-line at http://spot.lrde.lip6.fr/tools.html @@ -134,7 +134,7 @@ Layout of the source tree Core directories ---------------- -src/ Sources for libspot. +spot/ Sources for libspot. bin/ User tools built using the Spot library. man/ Man pages for the above tools. graph/ Graph representations. diff --git a/bench/stutter/Makefile.am b/bench/stutter/Makefile.am index dad9e01fa..ff4e35075 100644 --- a/bench/stutter/Makefile.am +++ b/bench/stutter/Makefile.am @@ -17,12 +17,12 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(BUDDY_CPPFLAGS) \ +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) \ -I$(top_builddir)/lib -I$(top_srcdir)/lib AM_CXXFLAGS = $(WARNING_CXXFLAGS) -LDADD = $(top_builddir)/src/bin/libcommon.a ../../lib/libgnu.la \ - ../../src/libspot.la +LDADD = $(top_builddir)/spot/bin/libcommon.a ../../lib/libgnu.la \ + ../../spot/libspot.la bin_PROGRAMS = stutter_invariance_randomgraph \ stutter_invariance_formulas diff --git a/bench/stutter/stutter_invariance_formulas.cc b/bench/stutter/stutter_invariance_formulas.cc index 48e3fcf03..60cfa0f43 100644 --- a/bench/stutter/stutter_invariance_formulas.cc +++ b/bench/stutter/stutter_invariance_formulas.cc @@ -17,15 +17,15 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "bin/common_sys.hh" -#include "bin/common_setup.hh" -#include "bin/common_finput.hh" -#include "bin/common_output.hh" -#include "twaalgos/translate.hh" -#include "twaalgos/stutter.hh" -#include "twaalgos/stats.hh" -#include "tl/apcollect.hh" -#include "misc/timer.hh" +#include "spot/bin/common_sys.hh" +#include "spot/bin/common_setup.hh" +#include "spot/bin/common_finput.hh" +#include "spot/bin/common_output.hh" +#include +#include +#include +#include +#include #include const char argp_program_doc[] =""; diff --git a/bench/stutter/stutter_invariance_randomgraph.cc b/bench/stutter/stutter_invariance_randomgraph.cc index 1751509b5..e0a55e8ad 100644 --- a/bench/stutter/stutter_invariance_randomgraph.cc +++ b/bench/stutter/stutter_invariance_randomgraph.cc @@ -17,18 +17,18 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "misc/timer.hh" -#include "tl/apcollect.hh" -#include "twaalgos/complement.hh" -#include "twaalgos/remfin.hh" -#include "twaalgos/randomgraph.hh" -#include "twaalgos/dot.hh" -#include "twaalgos/product.hh" -#include "twaalgos/stutter.hh" -#include "twaalgos/stats.hh" -#include "twa/twagraph.hh" -#include "twa/bdddict.hh" -#include "misc/random.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/configure.ac b/configure.ac index 5c91e260e..d3738332a 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([tools]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.11 gnu tar-ustar color-tests parallel-tests]) AC_CONFIG_HEADERS([config.h])dnl Private config, not to be used in .hh files. -AX_PREFIX_CONFIG_H([src/misc/_config.h])dnl Public config, for .hh files. +AX_PREFIX_CONFIG_H([spot/misc/_config.h])dnl Public config, for .hh files. # If the user didn't supply a CFLAGS value, # set an empty one to prevent autoconf to stick -O2 -g here. @@ -202,24 +202,24 @@ AC_CONFIG_FILES([ iface/ltsmin/Makefile iface/Makefile lib/Makefile - src/bin/Makefile - src/bin/man/Makefile - src/graph/Makefile - src/kripke/Makefile - src/Makefile - src/misc/Makefile - src/parseaut/Makefile - src/parsetl/Makefile - src/priv/Makefile - src/sanity/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 + spot/bin/Makefile + spot/bin/man/Makefile + spot/graph/Makefile + spot/kripke/Makefile + spot/Makefile + spot/misc/Makefile + spot/parseaut/Makefile + spot/parsetl/Makefile + spot/priv/Makefile + spot/sanity/Makefile + spot/taalgos/Makefile + spot/ta/Makefile + spot/tests/defs + spot/tests/Makefile + spot/tl/Makefile + spot/twaalgos/gtec/Makefile + spot/twaalgos/Makefile + spot/twa/Makefile wrap/Makefile wrap/python/ajax/Makefile wrap/python/Makefile diff --git a/debian/rules b/debian/rules index 83f9501e1..dbba40adb 100755 --- a/debian/rules +++ b/debian/rules @@ -50,8 +50,8 @@ PYOTHERS=$(filter-out $(PYDEFAULT), $(shell py3versions --supported)) # compiled with -flto, the exception never traverses argp. Moving # the try/catch block inside parse_opt() also fixes this praticular # problem, but who knows about other exceptions? So as a workaround, -# we simply disable -flto in src/bin/. -FLTOWORKAROUND = perl -pi -e s/-flto// src/bin/Makefile +# we simply disable -flto in spot/bin/. +FLTOWORKAROUND = perl -pi -e s/-flto// spot/bin/Makefile # We want to build Spot twice: once to get profile data, and a second # time to use it. diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 431efefc5..a467c227a 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -152,7 +152,7 @@ FULL_PATH_NAMES = YES # will be relative from the directory where doxygen is started. # This tag requires that the tag FULL_PATH_NAMES is set to YES. -STRIP_FROM_PATH = @top_srcdir@/src/ \ +STRIP_FROM_PATH = @top_srcdir@/ \ @top_srcdir@/iface/ \ @srcdir@ @@ -163,7 +163,7 @@ STRIP_FROM_PATH = @top_srcdir@/src/ \ # specify the list of include paths that are normally passed to the compiler # using the -I flag. -STRIP_FROM_INC_PATH = @top_srcdir@/src/ \ +STRIP_FROM_INC_PATH = @top_srcdir@/ \ @top_srcdir@/iface/ # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but @@ -762,7 +762,7 @@ WARN_LOGFILE = # Note: If this tag is empty the current directory is searched. INPUT = @srcdir@/mainpage.dox \ - @top_srcdir@/src \ + @top_srcdir@/spot \ @top_srcdir@/iface # This tag can be used to specify the character encoding of the source files @@ -1992,7 +1992,7 @@ SEARCH_INCLUDES = YES # preprocessor. # This tag requires that the tag SEARCH_INCLUDES is set to YES. -INCLUDE_PATH = @top_srcdir@/src +INCLUDE_PATH = @top_srcdir@ # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # patterns (like *.h and *.hpp) to filter out the header-files in the diff --git a/doc/Makefile.am b/doc/Makefile.am index 4998104f0..8ffc44671 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -58,7 +58,7 @@ org: org-man: mkdir -p $(srcdir)/userdoc/man - $(top_srcdir)/tools/man2html.pl $(top_srcdir)/src/bin/man $(srcdir)/userdoc/man + $(top_srcdir)/tools/man2html.pl $(top_srcdir)/spot/bin/man $(srcdir)/userdoc/man ORG_FILES = \ org/.dir-locals.el.in \ diff --git a/doc/org/.dir-locals.el.in b/doc/org/.dir-locals.el.in index 3c6978fdd..12314a43d 100644 --- a/doc/org/.dir-locals.el.in +++ b/doc/org/.dir-locals.el.in @@ -6,14 +6,14 @@ (eval . (progn (setenv "PATH" - (concat "@abs_top_builddir@/src/bin" + (concat "@abs_top_builddir@/spot/bin" path-separator (getenv "PATH"))) (setenv "PYTHONPATH" (concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/wrap/python:@abs_top_srcdir@/wrap/python:" (getenv "PYTHONPATH"))) (setenv "DYLD_LIBRARY_PATH" - (concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/src/.libs:@abs_top_builddir@/buddy/src/.libs:" + (concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:" (getenv "DYLD_LIBRARY_PATH"))) (setenv "SPOT_DOTDEFAULT" "Brf(Lato)") (setenv "SPOT_DOTEXTRA" "node[style=filled, fillcolor=\"#ffffa0\"] edge[arrowhead=vee, arrowsize=.7]") diff --git a/doc/org/g++wrap.in b/doc/org/g++wrap.in index 0add0a5ec..4bd319840 100755 --- a/doc/org/g++wrap.in +++ b/doc/org/g++wrap.in @@ -2,5 +2,5 @@ # This is a wrapper around the compiler, to ensure that the code # example run from the org-mode file are all linked with Spot. exec @top_builddir@/libtool link @CXX@ -std=c++11 -Wall \ - -I@abs_top_srcdir@/src -I@abs_top_srcdir@/buddy/src \ - -I@abs_top_builddir@/src "$@" @abs_top_builddir@/src/libspot.la + -I@abs_top_builddir@ -I@abs_top_srcdir@ -I@abs_top_srcdir@/buddy/src \ + "$@" @abs_top_builddir@/spot/libspot.la diff --git a/doc/org/init.el.in b/doc/org/init.el.in index d0705cc98..ce8b2f25c 100644 --- a/doc/org/init.el.in +++ b/doc/org/init.el.in @@ -31,12 +31,12 @@ (setq shell-file-name "@SHELL@") (setenv "PATH" - (concat "@abs_top_builddir@/src/bin" path-separator (getenv "PATH"))) + (concat "@abs_top_builddir@/spot/bin" path-separator (getenv "PATH"))) (setenv "PYTHONPATH" (concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/wrap/python:@abs_top_srcdir@/wrap/python:" (getenv "PYTHONPATH"))) (setenv "DYLD_LIBRARY_PATH" - (concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/src/.libs:@abs_top_builddir@/buddy/src/.libs:" + (concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:" (getenv "DYLD_LIBRARY_PATH"))) (setenv "SPOT_DOTDEFAULT" "Brf(Lato)") (setenv "SPOT_DOTEXTRA" diff --git a/doc/org/tut01.org b/doc/org/tut01.org index a9c266f48..cc265deeb 100644 --- a/doc/org/tut01.org +++ b/doc/org/tut01.org @@ -69,8 +69,8 @@ exceptions. #+BEGIN_SRC C++ :results verbatim :exports both #include - #include "tl/parse.hh" - #include "tl/print.hh" + #include + #include int main() { @@ -110,8 +110,8 @@ Here is how to call the infix parser explicitly: #+BEGIN_SRC C++ :results verbatim :exports both #include #include - #include "tl/parse.hh" - #include "tl/print.hh" + #include + #include int main() { @@ -152,8 +152,8 @@ with the "fixed" formula if you wish. Here is an example: #+BEGIN_SRC C++ :results verbatim :exports both #include #include - #include "tl/parse.hh" - #include "tl/print.hh" + #include + #include int main() { @@ -193,8 +193,8 @@ of =parse_infix_psl()=. #+BEGIN_SRC C++ :results verbatim :exports both #include #include - #include "tl/parse.hh" - #include "tl/print.hh" + #include + #include int main() { @@ -237,8 +237,8 @@ For instance, let's see what happens if a PSL formulas is passed to #+BEGIN_SRC C++ :results verbatim :exports both #include #include - #include "tl/parse.hh" - #include "tl/print.hh" + #include + #include int main() { @@ -267,8 +267,8 @@ The first is to simply diagnose non-LTL formulas. #+BEGIN_SRC C++ :results verbatim :exports code #include #include - #include "tl/parse.hh" - #include "tl/print.hh" + #include + #include int main() { @@ -296,9 +296,9 @@ prepared to reject the formula any way. In our example, we are lucky #+BEGIN_SRC C++ :results verbatim :exports both #include #include - #include "tl/parse.hh" - #include "tl/print.hh" - #include "tl/simplify.hh" + #include + #include + #include int main() { diff --git a/doc/org/tut02.org b/doc/org/tut02.org index 7d280d204..d1a9db045 100644 --- a/doc/org/tut02.org +++ b/doc/org/tut02.org @@ -80,9 +80,9 @@ destructor. #+BEGIN_SRC C++ :results verbatim :exports both #include #include - #include "tl/parse.hh" - #include "tl/print.hh" - #include "tl/relabel.hh" + #include + #include + #include int main() { diff --git a/doc/org/tut03.org b/doc/org/tut03.org index 418a9f6f8..837542c93 100644 --- a/doc/org/tut03.org +++ b/doc/org/tut03.org @@ -89,8 +89,8 @@ detail of the top-level oeprator in the formula. #+BEGIN_SRC C++ :results verbatim :exports both #include - #include "tl/formula.hh" - #include "tl/print.hh" + #include + #include int main() { @@ -200,9 +200,9 @@ time time by not exploring further. #+BEGIN_SRC C++ :results verbatim :exports both #include - #include "tl/formula.hh" - #include "tl/print.hh" - #include "tl/parse.hh" + #include + #include + #include int main() { @@ -248,9 +248,9 @@ in a formula: #+BEGIN_SRC C++ :results verbatim :exports both #include - #include "tl/formula.hh" - #include "tl/print.hh" - #include "tl/parse.hh" + #include + #include + #include spot::formula xchg_fg(spot::formula in) { diff --git a/doc/org/tut10.org b/doc/org/tut10.org index 91373ca2e..34701ffb1 100644 --- a/doc/org/tut10.org +++ b/doc/org/tut10.org @@ -129,10 +129,10 @@ never claim is done via the =print_never_claim= function. #+BEGIN_SRC C++ :results verbatim :exports both #include #include - #include "tl/parse.hh" - #include "tl/print.hh" - #include "twaalgos/translate.hh" - #include "twaalgos/neverclaim.hh" + #include + #include + #include + #include int main() { diff --git a/doc/org/tut20.org b/doc/org/tut20.org index 59ea25d4a..2de1477c0 100644 --- a/doc/org/tut20.org +++ b/doc/org/tut20.org @@ -137,8 +137,8 @@ non-empty. #+BEGIN_SRC C++ :results verbatim :exports both :wrap SRC hoa #include #include - #include "parseaut/public.hh" - #include "twaalgos/hoa.hh" + #include + #include int main() { diff --git a/doc/org/tut21.org b/doc/org/tut21.org index a8dcbafd8..4b114f27a 100644 --- a/doc/org/tut21.org +++ b/doc/org/tut21.org @@ -61,9 +61,9 @@ corresponding BDD variable number, and then use for instance #+BEGIN_SRC C++ :results verbatim :exports both #include #include - #include "parseaut/public.hh" - #include "twaalgos/hoa.hh" - #include "twa/bddprint.hh" + #include + #include + #include void custom_print(std::ostream& out, spot::twa_graph_ptr& aut); diff --git a/doc/org/tut22.org b/doc/org/tut22.org index d8f405775..1413eae30 100644 --- a/doc/org/tut22.org +++ b/doc/org/tut22.org @@ -7,8 +7,8 @@ This example demonstrates how to create an automaton in C++, and then print it. #+BEGIN_SRC C++ :results verbatim :exports both :wrap SRC hoa #include - #include "twaalgos/hoa.hh" - #include "twa/twagraph.hh" + #include + #include int main(void) { diff --git a/doc/org/tut30.org b/doc/org/tut30.org index c08fb76f2..8f24f64cc 100644 --- a/doc/org/tut30.org +++ b/doc/org/tut30.org @@ -231,9 +231,9 @@ automaton to process. #+BEGIN_SRC C++ :results verbatim :exports both :wrap SRC hoa #include - #include "parseaut/public.hh" - #include "twaalgos/postproc.hh" - #include "twaalgos/hoa.hh" + #include + #include + #include int main() { diff --git a/iface/ltsmin/Makefile.am b/iface/ltsmin/Makefile.am index d20011160..636dfbf74 100644 --- a/iface/ltsmin/Makefile.am +++ b/iface/ltsmin/Makefile.am @@ -17,7 +17,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src \ +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \ $(BUDDY_CPPFLAGS) -I$(top_srcdir)/ltdl AM_CXXFLAGS = $(WARNING_CXXFLAGS) @@ -27,7 +27,7 @@ ltsmin_HEADERS = ltsmin.hh lib_LTLIBRARIES = libspotltsmin.la libspotltsmin_la_LIBADD = \ - $(top_builddir)/src/libspot.la \ + $(top_builddir)/spot/libspot.la \ $(top_builddir)/ltdl/libltdlc.la -lpthread libspotltsmin_la_LDFLAGS = -no-undefined $(SYMBOLIC_LDFLAGS) libspotltsmin_la_SOURCES = ltsmin.cc @@ -42,10 +42,10 @@ check_SCRIPTS = defs TESTS = check.test finite.test finite2.test kripke.test EXTRA_DIST = $(TESTS) beem-peterson.4.dve finite.dve finite.pm -kripke.test: $(top_builddir)/src/tests/parse_print$(EXEEXT) +kripke.test: $(top_builddir)/spot/tests/parse_print$(EXEEXT) -$(top_builddir)/src/tests/parse_print$(EXEEXT): - cd $(top_builddir)/src/tests && \ +$(top_builddir)/spot/tests/parse_print$(EXEEXT): + cd $(top_builddir)/spot/tests && \ $(MAKE) $(AM_MAKEFLAGS) parse_print$(EXEEXT) distclean-local: diff --git a/iface/ltsmin/kripke.test b/iface/ltsmin/kripke.test index 9a38511e2..c869d92a2 100755 --- a/iface/ltsmin/kripke.test +++ b/iface/ltsmin/kripke.test @@ -34,9 +34,9 @@ fi set -e run 0 ../modelcheck -gK ${srcdir}/finite.dve 'F("P.a > 5")' > output -run 0 ${top_builddir}/src/tests/parse_print output | tr -d '"' > output2 +run 0 ${top_builddir}/spot/tests/parse_print output | tr -d '"' > output2 tr -d '"' < output >outputF cmp outputF output2 ../modelcheck -gK $srcdir/beem-peterson.4.dve '!G("pos[1] < 3")' > outputP -${top_builddir}/src/tests/ikwiad -e -KPoutputP '!G("pos[1] < 3")' +${top_builddir}/spot/tests/ikwiad -e -KPoutputP '!G("pos[1] < 3")' diff --git a/iface/ltsmin/ltsmin.cc b/iface/ltsmin/ltsmin.cc index ea3fb918a..271b8a660 100644 --- a/iface/ltsmin/ltsmin.cc +++ b/iface/ltsmin/ltsmin.cc @@ -30,12 +30,12 @@ # define WEXITSTATUS(x) ((x) & 0xff) #endif -#include "ltsmin.hh" -#include "misc/hashfunc.hh" -#include "misc/fixpool.hh" -#include "misc/mspool.hh" -#include "misc/intvcomp.hh" -#include "misc/intvcmp2.hh" +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/iface/ltsmin/ltsmin.hh b/iface/ltsmin/ltsmin.hh index 264dc1259..d216ad7b6 100644 --- a/iface/ltsmin/ltsmin.hh +++ b/iface/ltsmin/ltsmin.hh @@ -19,8 +19,8 @@ #pragma once -#include "kripke/kripke.hh" -#include "tl/apcollect.hh" +#include +#include namespace spot { diff --git a/iface/ltsmin/modelcheck.cc b/iface/ltsmin/modelcheck.cc index 382894785..2d3cd1d2b 100644 --- a/iface/ltsmin/modelcheck.cc +++ b/iface/ltsmin/modelcheck.cc @@ -17,19 +17,19 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "ltsmin.hh" -#include "twaalgos/dot.hh" -#include "tl/defaultenv.hh" -#include "tl/parse.hh" -#include "twaalgos/translate.hh" -#include "twaalgos/emptiness.hh" -#include "twaalgos/postproc.hh" -#include "twa/twaproduct.hh" -#include "misc/timer.hh" -#include "misc/memusage.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include "kripke/kripkegraph.hh" -#include "twaalgos/hoa.hh" +#include +#include static void syntax(char* prog) diff --git a/src/.gitignore b/spot/.gitignore similarity index 100% rename from src/.gitignore rename to spot/.gitignore diff --git a/src/Makefile.am b/spot/Makefile.am similarity index 100% rename from src/Makefile.am rename to spot/Makefile.am diff --git a/src/bin/.gitignore b/spot/bin/.gitignore similarity index 100% rename from src/bin/.gitignore rename to spot/bin/.gitignore diff --git a/src/bin/Makefile.am b/spot/bin/Makefile.am similarity index 96% rename from src/bin/Makefile.am rename to spot/bin/Makefile.am index 0dc735be7..0673fe493 100644 --- a/src/bin/Makefile.am +++ b/spot/bin/Makefile.am @@ -19,7 +19,7 @@ SUBDIRS = . man -AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(BUDDY_CPPFLAGS) \ +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) \ -I$(top_builddir)/lib -I$(top_srcdir)/lib AM_CXXFLAGS = $(WARNING_CXXFLAGS) LDADD = libcommon.a $(top_builddir)/lib/libgnu.la ../libspot.la diff --git a/src/bin/README b/spot/bin/README similarity index 100% rename from src/bin/README rename to spot/bin/README diff --git a/src/bin/autfilt.cc b/spot/bin/autfilt.cc similarity index 96% rename from src/bin/autfilt.cc rename to spot/bin/autfilt.cc index 2b908a1ef..807db2098 100644 --- a/src/bin/autfilt.cc +++ b/spot/bin/autfilt.cc @@ -37,27 +37,27 @@ #include "common_conv.hh" #include "common_hoaread.hh" -#include "twaalgos/product.hh" -#include "twaalgos/isdet.hh" -#include "twaalgos/stutter.hh" -#include "twaalgos/isunamb.hh" -#include "misc/optionmap.hh" -#include "misc/timer.hh" -#include "misc/random.hh" -#include "parseaut/public.hh" -#include "tl/exclusive.hh" -#include "twaalgos/remprop.hh" -#include "twaalgos/randomize.hh" -#include "twaalgos/are_isomorphic.hh" -#include "twaalgos/canonicalize.hh" -#include "twaalgos/mask.hh" -#include "twaalgos/sepsets.hh" -#include "twaalgos/stripacc.hh" -#include "twaalgos/remfin.hh" -#include "twaalgos/cleanacc.hh" -#include "twaalgos/dtwasat.hh" -#include "twaalgos/complement.hh" -#include "twaalgos/strength.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static const char argp_program_doc[] ="\ Convert, transform, and filter omega-automata.\v\ diff --git a/src/bin/common_aoutput.cc b/spot/bin/common_aoutput.cc similarity index 97% rename from src/bin/common_aoutput.cc rename to spot/bin/common_aoutput.cc index b236a711e..cc16f7618 100644 --- a/src/bin/common_aoutput.cc +++ b/spot/bin/common_aoutput.cc @@ -25,15 +25,15 @@ #include "common_post.hh" #include "common_cout.hh" -#include "twa/bddprint.hh" +#include -#include "twaalgos/dot.hh" -#include "twaalgos/lbtt.hh" -#include "twaalgos/hoa.hh" -#include "twaalgos/neverclaim.hh" -#include "twaalgos/stutter.hh" -#include "twaalgos/isunamb.hh" -#include "twaalgos/strength.hh" +#include +#include +#include +#include +#include +#include +#include automaton_format_t automaton_format = Dot; static const char* opt_dot = nullptr; diff --git a/src/bin/common_aoutput.hh b/spot/bin/common_aoutput.hh similarity index 96% rename from src/bin/common_aoutput.hh rename to spot/bin/common_aoutput.hh index 8afc53dfe..593ae4fd7 100644 --- a/src/bin/common_aoutput.hh +++ b/spot/bin/common_aoutput.hh @@ -24,13 +24,13 @@ #include #include -#include "parseaut/public.hh" +#include -#include "twaalgos/stats.hh" -#include "twaalgos/sccinfo.hh" -#include "twaalgos/gtec/gtec.hh" -#include "twaalgos/word.hh" -#include "twaalgos/isdet.hh" +#include +#include +#include +#include +#include #include "common_file.hh" diff --git a/src/bin/common_conv.cc b/spot/bin/common_conv.cc similarity index 100% rename from src/bin/common_conv.cc rename to spot/bin/common_conv.cc diff --git a/src/bin/common_conv.hh b/spot/bin/common_conv.hh similarity index 97% rename from src/bin/common_conv.hh rename to spot/bin/common_conv.hh index 43d7b4622..a41894539 100644 --- a/src/bin/common_conv.hh +++ b/spot/bin/common_conv.hh @@ -20,7 +20,7 @@ #pragma once #include "common_sys.hh" -#include "twa/twagraph.hh" +#include int to_int(const char* s); int to_pos_int(const char* s); diff --git a/src/bin/common_cout.cc b/spot/bin/common_cout.cc similarity index 100% rename from src/bin/common_cout.cc rename to spot/bin/common_cout.cc diff --git a/src/bin/common_cout.hh b/spot/bin/common_cout.hh similarity index 100% rename from src/bin/common_cout.hh rename to spot/bin/common_cout.hh diff --git a/src/bin/common_file.cc b/spot/bin/common_file.cc similarity index 100% rename from src/bin/common_file.cc rename to spot/bin/common_file.cc diff --git a/src/bin/common_file.hh b/spot/bin/common_file.hh similarity index 100% rename from src/bin/common_file.hh rename to spot/bin/common_file.hh diff --git a/src/bin/common_finput.cc b/spot/bin/common_finput.cc similarity index 100% rename from src/bin/common_finput.cc rename to spot/bin/common_finput.cc diff --git a/src/bin/common_finput.hh b/spot/bin/common_finput.hh similarity index 98% rename from src/bin/common_finput.hh rename to spot/bin/common_finput.hh index 9ee5f855b..295b4b871 100644 --- a/src/bin/common_finput.hh +++ b/spot/bin/common_finput.hh @@ -23,7 +23,7 @@ #include #include -#include "tl/parse.hh" +#include struct job { diff --git a/src/bin/common_hoaread.cc b/spot/bin/common_hoaread.cc similarity index 100% rename from src/bin/common_hoaread.cc rename to spot/bin/common_hoaread.cc diff --git a/src/bin/common_hoaread.hh b/spot/bin/common_hoaread.hh similarity index 96% rename from src/bin/common_hoaread.hh rename to spot/bin/common_hoaread.hh index 9a3654a9f..100e675e1 100644 --- a/src/bin/common_hoaread.hh +++ b/spot/bin/common_hoaread.hh @@ -23,7 +23,7 @@ #include -#include "parseaut/public.hh" +#include extern const struct argp hoaread_argp; diff --git a/src/bin/common_output.cc b/spot/bin/common_output.cc similarity index 98% rename from src/bin/common_output.cc rename to spot/bin/common_output.cc index c67d901dd..81eff78aa 100644 --- a/src/bin/common_output.cc +++ b/spot/bin/common_output.cc @@ -21,9 +21,9 @@ #include "common_output.hh" #include #include -#include "tl/print.hh" -#include "misc/formater.hh" -#include "misc/escape.hh" +#include +#include +#include #include "common_cout.hh" #include "error.h" diff --git a/src/bin/common_output.hh b/spot/bin/common_output.hh similarity index 97% rename from src/bin/common_output.hh rename to spot/bin/common_output.hh index 795e05ff9..ebc93dcf0 100644 --- a/src/bin/common_output.hh +++ b/spot/bin/common_output.hh @@ -24,8 +24,8 @@ #include #include #include -#include "tl/formula.hh" -#include "twaalgos/stats.hh" +#include +#include #include "common_output.hh" #include "common_file.hh" diff --git a/src/bin/common_post.cc b/spot/bin/common_post.cc similarity index 100% rename from src/bin/common_post.cc rename to spot/bin/common_post.cc diff --git a/src/bin/common_post.hh b/spot/bin/common_post.hh similarity index 97% rename from src/bin/common_post.hh rename to spot/bin/common_post.hh index 31443d8c9..8e219bfc0 100644 --- a/src/bin/common_post.hh +++ b/spot/bin/common_post.hh @@ -20,7 +20,7 @@ #pragma once #include "common_sys.hh" -#include "twaalgos/postproc.hh" +#include #include extern const struct argp post_argp; // postprocessing enabled diff --git a/src/bin/common_r.cc b/spot/bin/common_r.cc similarity index 100% rename from src/bin/common_r.cc rename to spot/bin/common_r.cc diff --git a/src/bin/common_r.hh b/spot/bin/common_r.hh similarity index 98% rename from src/bin/common_r.hh rename to spot/bin/common_r.hh index 95860e2bc..9a36c104a 100644 --- a/src/bin/common_r.hh +++ b/spot/bin/common_r.hh @@ -20,7 +20,7 @@ #pragma once #include "common_sys.hh" -#include "tl/simplify.hh" +#include #define OPT_R 'r' diff --git a/src/bin/common_range.cc b/spot/bin/common_range.cc similarity index 100% rename from src/bin/common_range.cc rename to spot/bin/common_range.cc diff --git a/src/bin/common_range.hh b/spot/bin/common_range.hh similarity index 100% rename from src/bin/common_range.hh rename to spot/bin/common_range.hh diff --git a/src/bin/common_setup.cc b/spot/bin/common_setup.cc similarity index 99% rename from src/bin/common_setup.cc rename to spot/bin/common_setup.cc index 411890070..368210989 100644 --- a/src/bin/common_setup.cc +++ b/spot/bin/common_setup.cc @@ -23,7 +23,7 @@ #include #include #include -#include "misc/tmpfile.hh" +#include const char* argp_program_bug_address = "<" PACKAGE_BUGREPORT ">"; diff --git a/src/bin/common_setup.hh b/spot/bin/common_setup.hh similarity index 100% rename from src/bin/common_setup.hh rename to spot/bin/common_setup.hh diff --git a/src/bin/common_sys.hh b/spot/bin/common_sys.hh similarity index 100% rename from src/bin/common_sys.hh rename to spot/bin/common_sys.hh diff --git a/src/bin/common_trans.cc b/spot/bin/common_trans.cc similarity index 99% rename from src/bin/common_trans.cc rename to spot/bin/common_trans.cc index f484b03b8..5c5ec3332 100644 --- a/src/bin/common_trans.cc +++ b/spot/bin/common_trans.cc @@ -28,9 +28,9 @@ #include "error.h" -#include "tl/print.hh" +#include #include "common_conv.hh" -#include "misc/escape.hh" +#include // A set of tools for which we know the correct output static struct shorthands_t diff --git a/src/bin/common_trans.hh b/spot/bin/common_trans.hh similarity index 97% rename from src/bin/common_trans.hh rename to spot/bin/common_trans.hh index 11ffe2125..a14be1782 100644 --- a/src/bin/common_trans.hh +++ b/spot/bin/common_trans.hh @@ -23,9 +23,9 @@ #include #include -#include "misc/formater.hh" -#include "misc/tmpfile.hh" -#include "twa/twagraph.hh" +#include +#include +#include extern const struct argp trans_argp; diff --git a/src/bin/dstar2tgba.cc b/spot/bin/dstar2tgba.cc similarity index 92% rename from src/bin/dstar2tgba.cc rename to spot/bin/dstar2tgba.cc index 80ea7d739..c7ab6b6c2 100644 --- a/src/bin/dstar2tgba.cc +++ b/spot/bin/dstar2tgba.cc @@ -34,17 +34,17 @@ #include "common_file.hh" #include "common_hoaread.hh" -#include "twaalgos/dot.hh" -#include "twaalgos/lbtt.hh" -#include "twaalgos/hoa.hh" -#include "twaalgos/neverclaim.hh" -#include "twaalgos/stats.hh" -#include "twaalgos/totgba.hh" -#include "twa/bddprint.hh" -#include "misc/optionmap.hh" -#include "misc/timer.hh" -#include "parseaut/public.hh" -#include "twaalgos/sccinfo.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static const char argp_program_doc[] ="\ Convert automata with any acceptance condition into variants of \ diff --git a/src/bin/genltl.cc b/spot/bin/genltl.cc similarity index 99% rename from src/bin/genltl.cc rename to spot/bin/genltl.cc index 16eb65f5a..94eb75cd1 100644 --- a/src/bin/genltl.cc +++ b/spot/bin/genltl.cc @@ -86,8 +86,8 @@ #include #include #include -#include "tl/formula.hh" -#include "tl/relabel.hh" +#include +#include using namespace spot; diff --git a/src/bin/ltl2tgba.cc b/spot/bin/ltl2tgba.cc similarity index 96% rename from src/bin/ltl2tgba.cc rename to spot/bin/ltl2tgba.cc index 25da76702..5731b5fc0 100644 --- a/src/bin/ltl2tgba.cc +++ b/spot/bin/ltl2tgba.cc @@ -33,11 +33,11 @@ #include "common_aoutput.hh" #include "common_post.hh" -#include "tl/formula.hh" -#include "tl/print.hh" -#include "twaalgos/translate.hh" -#include "misc/optionmap.hh" -#include "misc/timer.hh" +#include +#include +#include +#include +#include static const char argp_program_doc[] ="\ Translate linear-time formulas (LTL/PSL) into Büchi automata.\n\n\ diff --git a/src/bin/ltl2tgta.cc b/spot/bin/ltl2tgta.cc similarity index 94% rename from src/bin/ltl2tgta.cc rename to spot/bin/ltl2tgta.cc index 83b5d2f1b..8078397d8 100644 --- a/src/bin/ltl2tgta.cc +++ b/spot/bin/ltl2tgta.cc @@ -32,18 +32,18 @@ #include "common_finput.hh" #include "common_post.hh" -#include "tl/parse.hh" -#include "tl/print.hh" -#include "tl/simplify.hh" -#include "twaalgos/dot.hh" -#include "twaalgos/ltl2tgba_fm.hh" -#include "twaalgos/translate.hh" -#include "twa/bddprint.hh" +#include +#include +#include +#include +#include +#include +#include -#include "taalgos/tgba2ta.hh" -#include "taalgos/dot.hh" -#include "taalgos/minimize.hh" -#include "misc/optionmap.hh" +#include +#include +#include +#include const char argp_program_doc[] ="\ Translate linear-time formulas (LTL/PSL) into Testing Automata.\n\n\ diff --git a/src/bin/ltlcross.cc b/spot/bin/ltlcross.cc similarity index 97% rename from src/bin/ltlcross.cc rename to spot/bin/ltlcross.cc index 7b208c3c2..c2759f25d 100644 --- a/src/bin/ltlcross.cc +++ b/spot/bin/ltlcross.cc @@ -39,31 +39,31 @@ #include "common_file.hh" #include "common_finput.hh" #include "common_hoaread.hh" -#include "parseaut/public.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" -#include "twaalgos/remfin.hh" -#include "twaalgos/gtec/gtec.hh" -#include "twaalgos/randomgraph.hh" -#include "twaalgos/sccinfo.hh" -#include "twaalgos/isweakscc.hh" -#include "twaalgos/word.hh" -#include "twaalgos/complement.hh" -#include "twaalgos/cleanacc.hh" -#include "misc/formater.hh" -#include "twaalgos/stats.hh" -#include "twaalgos/isdet.hh" -#include "twaalgos/isunamb.hh" -#include "misc/escape.hh" -#include "misc/hash.hh" -#include "misc/random.hh" -#include "misc/tmpfile.hh" -#include "misc/timer.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include const char argp_program_doc[] ="\ Call several LTL/PSL translators and cross-compare their output to detect \ diff --git a/src/bin/ltldo.cc b/spot/bin/ltldo.cc similarity index 97% rename from src/bin/ltldo.cc rename to spot/bin/ltldo.cc index 8b1ac0ff9..7de127fe9 100644 --- a/src/bin/ltldo.cc +++ b/spot/bin/ltldo.cc @@ -36,13 +36,13 @@ #include "common_trans.hh" #include "common_hoaread.hh" -#include "tl/relabel.hh" -#include "misc/bareword.hh" -#include "misc/timer.hh" -#include "twaalgos/lbtt.hh" -#include "twaalgos/relabel.hh" -#include "twaalgos/totgba.hh" -#include "parseaut/public.hh" +#include +#include +#include +#include +#include +#include +#include const char argp_program_doc[] ="\ Run LTL/PSL formulas through another program, performing conversion\n\ diff --git a/src/bin/ltlfilt.cc b/spot/bin/ltlfilt.cc similarity index 97% rename from src/bin/ltlfilt.cc rename to spot/bin/ltlfilt.cc index d544486b1..7f811b3a3 100644 --- a/src/bin/ltlfilt.cc +++ b/spot/bin/ltlfilt.cc @@ -34,19 +34,19 @@ #include "common_conv.hh" #include "common_r.hh" -#include "misc/hash.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/strength.hh" -#include "twaalgos/stutter.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include const char argp_program_doc[] ="\ Read a list of formulas and output them back after some optional processing.\v\ diff --git a/src/bin/ltlgrind.cc b/spot/bin/ltlgrind.cc similarity index 99% rename from src/bin/ltlgrind.cc rename to spot/bin/ltlgrind.cc index de2becf04..cd6f26654 100644 --- a/src/bin/ltlgrind.cc +++ b/spot/bin/ltlgrind.cc @@ -27,7 +27,7 @@ #include "common_output.hh" #include "common_conv.hh" -#include "tl/mutation.hh" +#include enum { OPT_AP2CONST = 1, diff --git a/src/bin/man/Makefile.am b/spot/bin/man/Makefile.am similarity index 100% rename from src/bin/man/Makefile.am rename to spot/bin/man/Makefile.am diff --git a/src/bin/man/autfilt.x b/spot/bin/man/autfilt.x similarity index 100% rename from src/bin/man/autfilt.x rename to spot/bin/man/autfilt.x diff --git a/src/bin/man/dstar2tgba.x b/spot/bin/man/dstar2tgba.x similarity index 100% rename from src/bin/man/dstar2tgba.x rename to spot/bin/man/dstar2tgba.x diff --git a/src/bin/man/genltl.x b/spot/bin/man/genltl.x similarity index 100% rename from src/bin/man/genltl.x rename to spot/bin/man/genltl.x diff --git a/src/bin/man/ltl2tgba.x b/spot/bin/man/ltl2tgba.x similarity index 100% rename from src/bin/man/ltl2tgba.x rename to spot/bin/man/ltl2tgba.x diff --git a/src/bin/man/ltl2tgta.x b/spot/bin/man/ltl2tgta.x similarity index 100% rename from src/bin/man/ltl2tgta.x rename to spot/bin/man/ltl2tgta.x diff --git a/src/bin/man/ltlcross.x b/spot/bin/man/ltlcross.x similarity index 100% rename from src/bin/man/ltlcross.x rename to spot/bin/man/ltlcross.x diff --git a/src/bin/man/ltldo.x b/spot/bin/man/ltldo.x similarity index 100% rename from src/bin/man/ltldo.x rename to spot/bin/man/ltldo.x diff --git a/src/bin/man/ltlfilt.x b/spot/bin/man/ltlfilt.x similarity index 100% rename from src/bin/man/ltlfilt.x rename to spot/bin/man/ltlfilt.x diff --git a/src/bin/man/ltlgrind.x b/spot/bin/man/ltlgrind.x similarity index 100% rename from src/bin/man/ltlgrind.x rename to spot/bin/man/ltlgrind.x diff --git a/src/bin/man/randaut.x b/spot/bin/man/randaut.x similarity index 100% rename from src/bin/man/randaut.x rename to spot/bin/man/randaut.x diff --git a/src/bin/man/randltl.x b/spot/bin/man/randltl.x similarity index 100% rename from src/bin/man/randltl.x rename to spot/bin/man/randltl.x diff --git a/src/bin/man/spot-x.x b/spot/bin/man/spot-x.x similarity index 100% rename from src/bin/man/spot-x.x rename to spot/bin/man/spot-x.x diff --git a/src/bin/options.py b/spot/bin/options.py similarity index 100% rename from src/bin/options.py rename to spot/bin/options.py diff --git a/src/bin/randaut.cc b/spot/bin/randaut.cc similarity index 98% rename from src/bin/randaut.cc rename to spot/bin/randaut.cc index d7874ade1..2effda970 100644 --- a/src/bin/randaut.cc +++ b/spot/bin/randaut.cc @@ -34,12 +34,12 @@ #include "common_aoutput.hh" #include "common_conv.hh" -#include "misc/timer.hh" -#include "misc/random.hh" +#include +#include -#include "twa/bddprint.hh" -#include "twaalgos/randomgraph.hh" -#include "twaalgos/canonicalize.hh" +#include +#include +#include const char argp_program_doc[] = "\ diff --git a/src/bin/randltl.cc b/spot/bin/randltl.cc similarity index 98% rename from src/bin/randltl.cc rename to spot/bin/randltl.cc index d32d9cbf2..569c46051 100644 --- a/src/bin/randltl.cc +++ b/spot/bin/randltl.cc @@ -33,10 +33,10 @@ #include "common_conv.hh" #include -#include "tl/randomltl.hh" -#include "tl/simplify.hh" -#include "misc/random.hh" -#include "misc/optionmap.hh" +#include +#include +#include +#include const char argp_program_doc[] ="\ Generate random temporal logic formulas.\n\n\ diff --git a/src/bin/spot-x.cc b/spot/bin/spot-x.cc similarity index 100% rename from src/bin/spot-x.cc rename to spot/bin/spot-x.cc diff --git a/src/graph/Makefile.am b/spot/graph/Makefile.am similarity index 95% rename from src/graph/Makefile.am rename to spot/graph/Makefile.am index 04e01c39c..9af6d639c 100644 --- a/src/graph/Makefile.am +++ b/spot/graph/Makefile.am @@ -18,7 +18,7 @@ ## along with this program. If not, see . -AM_CPPFLAGS = -I$(srcdir)/.. +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) AM_CXXFLAGS = $(WARNING_CXXFLAGS) graphdir = $(pkgincludedir)/graph @@ -26,4 +26,3 @@ graphdir = $(pkgincludedir)/graph graph_HEADERS = \ graph.hh \ ngraph.hh - diff --git a/src/graph/graph.hh b/spot/graph/graph.hh similarity index 99% rename from src/graph/graph.hh rename to spot/graph/graph.hh index 8a1c3d5c0..5e24665a7 100644 --- a/src/graph/graph.hh +++ b/spot/graph/graph.hh @@ -19,7 +19,7 @@ #pragma once -#include "misc/common.hh" +#include #include #include #include diff --git a/src/graph/ngraph.hh b/spot/graph/ngraph.hh similarity index 99% rename from src/graph/ngraph.hh rename to spot/graph/ngraph.hh index 0565c24db..e08b18c22 100644 --- a/src/graph/ngraph.hh +++ b/spot/graph/ngraph.hh @@ -21,7 +21,7 @@ #include #include -#include "graph.hh" +#include namespace spot { diff --git a/src/kripke/Makefile.am b/spot/kripke/Makefile.am similarity index 84% rename from src/kripke/Makefile.am rename to spot/kripke/Makefile.am index 6945dd8af..2b8d80a8f 100644 --- a/src/kripke/Makefile.am +++ b/spot/kripke/Makefile.am @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- -## Copyright (C) 2009, 2011, 2013, 2014 Laboratoire de Recherche et -## Developpement de l'Epita (LRDE). +## Copyright (C) 2009, 2011, 2013, 2014, 2015 Laboratoire de Recherche +## et Developpement de l'Epita (LRDE). ## ## This file is part of Spot, a model checking library. ## @@ -17,7 +17,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) kripkedir = $(pkgincludedir)/kripke diff --git a/src/kripke/fairkripke.cc b/spot/kripke/fairkripke.cc similarity index 97% rename from src/kripke/fairkripke.cc rename to spot/kripke/fairkripke.cc index 3e5148e5a..69d409417 100644 --- a/src/kripke/fairkripke.cc +++ b/spot/kripke/fairkripke.cc @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "fairkripke.hh" +#include namespace spot { diff --git a/src/kripke/fairkripke.hh b/spot/kripke/fairkripke.hh similarity index 98% rename from src/kripke/fairkripke.hh rename to spot/kripke/fairkripke.hh index ed69c06d1..ad54faaa4 100644 --- a/src/kripke/fairkripke.hh +++ b/spot/kripke/fairkripke.hh @@ -19,8 +19,8 @@ #pragma once -#include "twa/twa.hh" -#include "fwd.hh" +#include +#include /// \addtogroup kripke Kripke Structures /// \ingroup twa diff --git a/src/kripke/fwd.hh b/spot/kripke/fwd.hh similarity index 100% rename from src/kripke/fwd.hh rename to spot/kripke/fwd.hh diff --git a/src/kripke/kripke.cc b/spot/kripke/kripke.cc similarity index 97% rename from src/kripke/kripke.cc rename to spot/kripke/kripke.cc index 36d69c23a..3d2e391fc 100644 --- a/src/kripke/kripke.cc +++ b/spot/kripke/kripke.cc @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "kripke.hh" +#include namespace spot { diff --git a/src/kripke/kripke.hh b/spot/kripke/kripke.hh similarity index 98% rename from src/kripke/kripke.hh rename to spot/kripke/kripke.hh index e363a59fd..ae5391a1e 100644 --- a/src/kripke/kripke.hh +++ b/spot/kripke/kripke.hh @@ -19,7 +19,7 @@ #pragma once -#include "fairkripke.hh" +#include namespace spot { diff --git a/src/kripke/kripkegraph.hh b/spot/kripke/kripkegraph.hh similarity index 98% rename from src/kripke/kripkegraph.hh rename to spot/kripke/kripkegraph.hh index 122d88bd6..b97bfd01f 100644 --- a/src/kripke/kripkegraph.hh +++ b/spot/kripke/kripkegraph.hh @@ -20,9 +20,9 @@ #pragma once #include -#include "kripke.hh" -#include "graph/graph.hh" -#include "tl/formula.hh" +#include +#include +#include namespace spot { diff --git a/src/misc/.gitignore b/spot/misc/.gitignore similarity index 100% rename from src/misc/.gitignore rename to spot/misc/.gitignore diff --git a/src/misc/Makefile.am b/spot/misc/Makefile.am similarity index 96% rename from src/misc/Makefile.am rename to spot/misc/Makefile.am index 2835ea04e..233c1af6b 100644 --- a/src/misc/Makefile.am +++ b/spot/misc/Makefile.am @@ -20,7 +20,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) \ +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) \ -I$(top_builddir)/lib -I$(top_srcdir)/lib AM_CXXFLAGS = $(WARNING_CXXFLAGS) diff --git a/src/misc/bareword.cc b/spot/misc/bareword.cc similarity index 96% rename from src/misc/bareword.cc rename to spot/misc/bareword.cc index 4076d9b64..144242012 100644 --- a/src/misc/bareword.cc +++ b/spot/misc/bareword.cc @@ -21,9 +21,9 @@ // along with this program. If not, see . #include "config.h" -#include "bareword.hh" +#include #include -#include "escape.hh" +#include namespace spot { diff --git a/src/misc/bareword.hh b/spot/misc/bareword.hh similarity index 98% rename from src/misc/bareword.hh rename to spot/misc/bareword.hh index 6e99a0a6d..5d3b56902 100644 --- a/src/misc/bareword.hh +++ b/spot/misc/bareword.hh @@ -22,7 +22,7 @@ #pragma once -#include "common.hh" +#include #include namespace spot diff --git a/src/misc/bddlt.hh b/spot/misc/bddlt.hh similarity index 100% rename from src/misc/bddlt.hh rename to spot/misc/bddlt.hh diff --git a/src/misc/bitvect.cc b/spot/misc/bitvect.cc similarity index 99% rename from src/misc/bitvect.cc rename to spot/misc/bitvect.cc index 88f8d0b02..667738f3b 100644 --- a/src/misc/bitvect.cc +++ b/spot/misc/bitvect.cc @@ -20,7 +20,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "bitvect.hh" +#include #include #include #include diff --git a/src/misc/bitvect.hh b/spot/misc/bitvect.hh similarity index 99% rename from src/misc/bitvect.hh rename to spot/misc/bitvect.hh index 566039380..0d32db835 100644 --- a/src/misc/bitvect.hh +++ b/spot/misc/bitvect.hh @@ -19,7 +19,7 @@ #pragma once -#include "common.hh" +#include #include #include #include diff --git a/src/misc/casts.hh b/spot/misc/casts.hh similarity index 100% rename from src/misc/casts.hh rename to spot/misc/casts.hh diff --git a/src/misc/common.hh b/spot/misc/common.hh similarity index 100% rename from src/misc/common.hh rename to spot/misc/common.hh diff --git a/src/misc/escape.cc b/spot/misc/escape.cc similarity index 98% rename from src/misc/escape.cc rename to spot/misc/escape.cc index a10eb05c0..7024d090f 100644 --- a/src/misc/escape.cc +++ b/spot/misc/escape.cc @@ -24,7 +24,7 @@ #include #include #include -#include "escape.hh" +#include namespace spot { diff --git a/src/misc/escape.hh b/spot/misc/escape.hh similarity index 98% rename from src/misc/escape.hh rename to spot/misc/escape.hh index 5dff8261e..4fb777a38 100644 --- a/src/misc/escape.hh +++ b/spot/misc/escape.hh @@ -22,7 +22,7 @@ #pragma once -#include "common.hh" +#include #include #include diff --git a/src/misc/fixpool.hh b/spot/misc/fixpool.hh similarity index 100% rename from src/misc/fixpool.hh rename to spot/misc/fixpool.hh diff --git a/src/misc/formater.cc b/spot/misc/formater.cc similarity index 97% rename from src/misc/formater.cc rename to spot/misc/formater.cc index 1806a6faf..8d771363c 100644 --- a/src/misc/formater.cc +++ b/spot/misc/formater.cc @@ -18,7 +18,7 @@ // along with this program. If not, see . #include "config.h" -#include "formater.hh" +#include #include namespace spot diff --git a/src/misc/formater.hh b/spot/misc/formater.hh similarity index 99% rename from src/misc/formater.hh rename to spot/misc/formater.hh index 07494ee01..0dc04f54a 100644 --- a/src/misc/formater.hh +++ b/spot/misc/formater.hh @@ -19,7 +19,7 @@ #pragma once -#include "common.hh" +#include #include #include #include diff --git a/src/misc/hash.hh b/spot/misc/hash.hh similarity index 97% rename from src/misc/hash.hh rename to spot/misc/hash.hh index d0207b9b6..a45288e33 100644 --- a/src/misc/hash.hh +++ b/spot/misc/hash.hh @@ -24,8 +24,8 @@ #include #include -#include "misc/hashfunc.hh" -#include "misc/_config.h" +#include +#include #include #include diff --git a/src/misc/hashfunc.hh b/spot/misc/hashfunc.hh similarity index 100% rename from src/misc/hashfunc.hh rename to spot/misc/hashfunc.hh diff --git a/src/misc/intvcmp2.cc b/spot/misc/intvcmp2.cc similarity index 99% rename from src/misc/intvcmp2.cc rename to spot/misc/intvcmp2.cc index 81acb89a4..3f029f64b 100644 --- a/src/misc/intvcmp2.cc +++ b/spot/misc/intvcmp2.cc @@ -18,10 +18,10 @@ // along with this program. If not, see . #include "config.h" -#include "common.hh" +#include #include #include -#include "intvcmp2.hh" +#include namespace spot { diff --git a/src/misc/intvcmp2.hh b/spot/misc/intvcmp2.hh similarity index 98% rename from src/misc/intvcmp2.hh rename to spot/misc/intvcmp2.hh index 7e88ac181..2756e119d 100644 --- a/src/misc/intvcmp2.hh +++ b/spot/misc/intvcmp2.hh @@ -19,7 +19,7 @@ #pragma once -#include "common.hh" +#include #include #include diff --git a/src/misc/intvcomp.cc b/spot/misc/intvcomp.cc similarity index 99% rename from src/misc/intvcomp.cc rename to spot/misc/intvcomp.cc index 7b17a26e6..fbfd25035 100644 --- a/src/misc/intvcomp.cc +++ b/spot/misc/intvcomp.cc @@ -18,10 +18,10 @@ // along with this program. If not, see . #include "config.h" -#include "common.hh" +#include #include #include -#include "intvcomp.hh" +#include namespace spot { diff --git a/src/misc/intvcomp.hh b/spot/misc/intvcomp.hh similarity index 98% rename from src/misc/intvcomp.hh rename to spot/misc/intvcomp.hh index 6d85ca5d3..235aa60d2 100644 --- a/src/misc/intvcomp.hh +++ b/spot/misc/intvcomp.hh @@ -19,7 +19,7 @@ #pragma once -#include "common.hh" +#include #include #include diff --git a/src/misc/location.hh b/spot/misc/location.hh similarity index 99% rename from src/misc/location.hh rename to spot/misc/location.hh index 8ce58ddb5..67f00043c 100644 --- a/src/misc/location.hh +++ b/spot/misc/location.hh @@ -35,7 +35,7 @@ #pragma once -#include "position.hh" +#include namespace spot { diff --git a/src/misc/ltstr.hh b/spot/misc/ltstr.hh similarity index 100% rename from src/misc/ltstr.hh rename to spot/misc/ltstr.hh diff --git a/src/misc/memusage.cc b/spot/misc/memusage.cc similarity index 97% rename from src/misc/memusage.cc rename to spot/misc/memusage.cc index 4928569a9..968096d59 100644 --- a/src/misc/memusage.cc +++ b/spot/misc/memusage.cc @@ -21,7 +21,7 @@ // along with this program. If not, see . #include "config.h" -#include "memusage.hh" +#include #include namespace spot diff --git a/src/misc/memusage.hh b/spot/misc/memusage.hh similarity index 97% rename from src/misc/memusage.hh rename to spot/misc/memusage.hh index b6d66d266..0185941dc 100644 --- a/src/misc/memusage.hh +++ b/spot/misc/memusage.hh @@ -22,7 +22,7 @@ #pragma once -#include "common.hh" +#include namespace spot { diff --git a/src/misc/minato.cc b/spot/misc/minato.cc similarity index 99% rename from src/misc/minato.cc rename to spot/misc/minato.cc index 0d41cce3b..0eab66b19 100644 --- a/src/misc/minato.cc +++ b/spot/misc/minato.cc @@ -21,7 +21,7 @@ // along with this program. If not, see . #include "config.h" -#include "minato.hh" +#include #include namespace spot diff --git a/src/misc/minato.hh b/spot/misc/minato.hh similarity index 99% rename from src/misc/minato.hh rename to spot/misc/minato.hh index 67e6b85fd..3299f1253 100644 --- a/src/misc/minato.hh +++ b/spot/misc/minato.hh @@ -22,7 +22,7 @@ #pragma once -#include "common.hh" +#include #include #include diff --git a/src/misc/mspool.hh b/spot/misc/mspool.hh similarity index 99% rename from src/misc/mspool.hh rename to spot/misc/mspool.hh index 724063098..457f96fe2 100644 --- a/src/misc/mspool.hh +++ b/spot/misc/mspool.hh @@ -23,7 +23,7 @@ #include #include #include -#include "misc/hash.hh" +#include namespace spot { diff --git a/src/misc/optionmap.cc b/spot/misc/optionmap.cc similarity index 99% rename from src/misc/optionmap.cc rename to spot/misc/optionmap.cc index ec669247a..95f544681 100644 --- a/src/misc/optionmap.cc +++ b/spot/misc/optionmap.cc @@ -24,7 +24,7 @@ #include #include #include -#include "optionmap.hh" +#include namespace spot { diff --git a/src/misc/optionmap.hh b/spot/misc/optionmap.hh similarity index 99% rename from src/misc/optionmap.hh rename to spot/misc/optionmap.hh index 751157639..464f4cbe0 100644 --- a/src/misc/optionmap.hh +++ b/spot/misc/optionmap.hh @@ -22,7 +22,7 @@ #pragma once -#include "common.hh" +#include #include #include #include diff --git a/src/misc/position.hh b/spot/misc/position.hh similarity index 100% rename from src/misc/position.hh rename to spot/misc/position.hh diff --git a/src/misc/random.cc b/spot/misc/random.cc similarity index 98% rename from src/misc/random.cc rename to spot/misc/random.cc index 1f963a514..bcddfc71d 100644 --- a/src/misc/random.cc +++ b/spot/misc/random.cc @@ -21,7 +21,7 @@ // along with this program. If not, see . #include "config.h" -#include "random.hh" +#include #include namespace spot diff --git a/src/misc/random.hh b/spot/misc/random.hh similarity index 99% rename from src/misc/random.hh rename to spot/misc/random.hh index aa52d5db2..bc156177b 100644 --- a/src/misc/random.hh +++ b/spot/misc/random.hh @@ -22,7 +22,7 @@ #pragma once -#include "common.hh" +#include #include #include #include diff --git a/src/misc/satsolver.cc b/spot/misc/satsolver.cc similarity index 98% rename from src/misc/satsolver.cc rename to spot/misc/satsolver.cc index 886f6abd8..d863735c3 100644 --- a/src/misc/satsolver.cc +++ b/spot/misc/satsolver.cc @@ -18,11 +18,11 @@ // along with this program. If not, see . #include "config.h" -#include "formater.hh" +#include #include #include #include -#include "satsolver.hh" +#include #include #include #include diff --git a/src/misc/satsolver.hh b/spot/misc/satsolver.hh similarity index 97% rename from src/misc/satsolver.hh rename to spot/misc/satsolver.hh index a2e223ca5..434b679e9 100644 --- a/src/misc/satsolver.hh +++ b/spot/misc/satsolver.hh @@ -19,8 +19,8 @@ #pragma once -#include "common.hh" -#include "tmpfile.hh" +#include +#include #include #include #include diff --git a/src/misc/timer.cc b/spot/misc/timer.cc similarity index 99% rename from src/misc/timer.cc rename to spot/misc/timer.cc index 26474952d..2598c4c9f 100644 --- a/src/misc/timer.cc +++ b/spot/misc/timer.cc @@ -21,7 +21,7 @@ // along with this program. If not, see . #include "config.h" -#include "timer.hh" +#include #include #include diff --git a/src/misc/timer.hh b/spot/misc/timer.hh similarity index 98% rename from src/misc/timer.hh rename to spot/misc/timer.hh index 53aba03a2..a0e3ffaff 100644 --- a/src/misc/timer.hh +++ b/spot/misc/timer.hh @@ -22,8 +22,8 @@ #pragma once -#include "common.hh" -#include "misc/_config.h" +#include +#include #include #include #include diff --git a/src/misc/tmpfile.cc b/spot/misc/tmpfile.cc similarity index 99% rename from src/misc/tmpfile.cc rename to spot/misc/tmpfile.cc index 22ac10142..43b5dc103 100644 --- a/src/misc/tmpfile.cc +++ b/spot/misc/tmpfile.cc @@ -18,7 +18,7 @@ // along with this program. If not, see . #include "config.h" -#include "tmpfile.hh" +#include #include #include #include diff --git a/src/misc/tmpfile.hh b/spot/misc/tmpfile.hh similarity index 98% rename from src/misc/tmpfile.hh rename to spot/misc/tmpfile.hh index 20b95fd68..1a912bfe8 100644 --- a/src/misc/tmpfile.hh +++ b/spot/misc/tmpfile.hh @@ -19,12 +19,12 @@ #pragma once -#include "common.hh" +#include #include #include #include #include -#include "formater.hh" +#include namespace spot { diff --git a/src/misc/version.cc b/spot/misc/version.cc similarity index 94% rename from src/misc/version.cc rename to spot/misc/version.cc index 0a0124ff6..8daa1d2ad 100644 --- a/src/misc/version.cc +++ b/spot/misc/version.cc @@ -21,8 +21,8 @@ // along with this program. If not, see . #include "config.h" -#include "_config.h" -#include "version.hh" +#include +#include namespace spot { diff --git a/src/misc/version.hh b/spot/misc/version.hh similarity index 97% rename from src/misc/version.hh rename to spot/misc/version.hh index c0b81d233..f5d67b8e5 100644 --- a/src/misc/version.hh +++ b/spot/misc/version.hh @@ -22,7 +22,7 @@ #pragma once -#include "common.hh" +#include namespace spot { diff --git a/src/parseaut/.gitignore b/spot/parseaut/.gitignore similarity index 100% rename from src/parseaut/.gitignore rename to spot/parseaut/.gitignore diff --git a/src/parseaut/Makefile.am b/spot/parseaut/Makefile.am similarity index 95% rename from src/parseaut/Makefile.am rename to spot/parseaut/Makefile.am index ec4dd50f6..56d56fa4b 100644 --- a/src/parseaut/Makefile.am +++ b/spot/parseaut/Makefile.am @@ -17,7 +17,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) -DYY_NO_INPUT +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) -DYY_NO_INPUT # Disable -Werror because too many versions of flex yield warnings. AM_CXXFLAGS = $(WARNING_CXXFLAGS:-Werror=) diff --git a/src/parseaut/fmterror.cc b/spot/parseaut/fmterror.cc similarity index 97% rename from src/parseaut/fmterror.cc rename to spot/parseaut/fmterror.cc index 7f164aa31..936ce2f4f 100644 --- a/src/parseaut/fmterror.cc +++ b/spot/parseaut/fmterror.cc @@ -18,7 +18,7 @@ // along with this program. If not, see . #include -#include "public.hh" +#include namespace spot { diff --git a/src/parseaut/parseaut.yy b/spot/parseaut/parseaut.yy similarity index 99% rename from src/parseaut/parseaut.yy rename to spot/parseaut/parseaut.yy index c9fe646db..72c1f1632 100644 --- a/src/parseaut/parseaut.yy +++ b/spot/parseaut/parseaut.yy @@ -30,16 +30,16 @@ %code requires { #include "config.h" -#include "misc/common.hh" +#include #include #include #include #include #include -#include "twa/formula2bdd.hh" -#include "public.hh" -#include "priv/accmap.hh" -#include "tl/parse.hh" +#include +#include +#include "spot/priv/accmap.hh" +#include #ifndef HAVE_STRVERSCMP // If the libc does not have this, a version is compiled in lib/. @@ -170,7 +170,7 @@ extern "C" int strverscmp(const char *s1, const char *s2); /* parseaut.hh and parsedecl.hh include each other recursively. We must ensure that YYSTYPE is declared (by the above %union) before parsedecl.hh uses it. */ -#include "parsedecl.hh" +#include static void fill_guards(result_& res); } diff --git a/src/parseaut/parsedecl.hh b/spot/parseaut/parsedecl.hh similarity index 94% rename from src/parseaut/parsedecl.hh rename to spot/parseaut/parsedecl.hh index 22efdd68a..45a830a71 100644 --- a/src/parseaut/parsedecl.hh +++ b/spot/parseaut/parsedecl.hh @@ -20,8 +20,8 @@ #pragma once #include -#include "parseaut.hh" -#include "misc/location.hh" +#include +#include # define YY_DECL \ int hoayylex(hoayy::parser::semantic_type *yylval, \ diff --git a/src/parseaut/public.hh b/spot/parseaut/public.hh similarity index 97% rename from src/parseaut/public.hh rename to spot/parseaut/public.hh index db3d0d806..6ccf6ee88 100644 --- a/src/parseaut/public.hh +++ b/spot/parseaut/public.hh @@ -19,15 +19,15 @@ #pragma once -#include "twa/twagraph.hh" -#include "kripke/kripkegraph.hh" -#include "misc/location.hh" -#include "tl/defaultenv.hh" +#include +#include +#include +#include #include #include #include #include -#include +#include namespace spot { diff --git a/src/parseaut/scanaut.ll b/spot/parseaut/scanaut.ll similarity index 99% rename from src/parseaut/scanaut.ll rename to spot/parseaut/scanaut.ll index e360b6ecc..163dbc4b0 100644 --- a/src/parseaut/scanaut.ll +++ b/spot/parseaut/scanaut.ll @@ -25,8 +25,8 @@ %{ #include #include -#include "parseaut/parsedecl.hh" -#include "priv/trim.hh" +#include +#include "spot/priv/trim.hh" #define YY_USER_ACTION yylloc->columns(yyleng); #define YY_NEVER_INTERACTIVE 1 diff --git a/src/parsetl/.gitignore b/spot/parsetl/.gitignore similarity index 100% rename from src/parsetl/.gitignore rename to spot/parsetl/.gitignore diff --git a/src/parsetl/Makefile.am b/spot/parsetl/Makefile.am similarity index 96% rename from src/parsetl/Makefile.am rename to spot/parsetl/Makefile.am index 4aaeeb97b..3a8edf31e 100644 --- a/src/parsetl/Makefile.am +++ b/spot/parsetl/Makefile.am @@ -20,7 +20,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)/.. -I.. -DYY_NO_INPUT +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -DYY_NO_INPUT # Disable -Werror because too many versions of flex yield warnings. AM_CXXFLAGS = $(WARNING_CXXFLAGS:-Werror=) diff --git a/src/parsetl/fmterror.cc b/spot/parsetl/fmterror.cc similarity index 99% rename from src/parsetl/fmterror.cc rename to spot/parsetl/fmterror.cc index 874000be9..470403c56 100644 --- a/src/parsetl/fmterror.cc +++ b/spot/parsetl/fmterror.cc @@ -20,7 +20,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "tl/parse.hh" +#include #include #include #include diff --git a/src/parsetl/parsedecl.hh b/spot/parsetl/parsedecl.hh similarity index 94% rename from src/parsetl/parsedecl.hh rename to spot/parsetl/parsedecl.hh index be3e4ee6a..1e023accc 100644 --- a/src/parsetl/parsedecl.hh +++ b/spot/parsetl/parsedecl.hh @@ -22,8 +22,8 @@ #pragma once -#include "parsetl.hh" -#include "misc/location.hh" +#include +#include # define YY_DECL \ int tlyylex (tlyy::parser::semantic_type *yylval, \ diff --git a/src/parsetl/parsetl.yy b/spot/parsetl/parsetl.yy similarity index 99% rename from src/parsetl/parsetl.yy rename to spot/parsetl/parsetl.yy index fdf29bf8d..7ff2bbb45 100644 --- a/src/parsetl/parsetl.yy +++ b/spot/parsetl/parsetl.yy @@ -34,9 +34,9 @@ { #include #include -#include "tl/parse.hh" -#include "tl/formula.hh" -#include "tl/print.hh" +#include +#include +#include struct minmax_t { unsigned min, max; }; } @@ -56,7 +56,7 @@ /* parsetl.hh and parsedecl.hh include each other recursively. We mut ensure that YYSTYPE is declared (by the above %union) before parsedecl.hh uses it. */ -#include "parsedecl.hh" +#include using namespace spot; #define missing_right_op_msg(op, str) \ diff --git a/src/parsetl/scantl.ll b/spot/parsetl/scantl.ll similarity index 99% rename from src/parsetl/scantl.ll rename to spot/parsetl/scantl.ll index a1cfe66c5..fc40db1b8 100644 --- a/src/parsetl/scantl.ll +++ b/spot/parsetl/scantl.ll @@ -30,8 +30,8 @@ #include #include -#include "parsedecl.hh" -#include "priv/trim.hh" +#include +#include "spot/priv/trim.hh" #define YY_USER_ACTION \ yylloc->columns(yyleng); diff --git a/src/priv/Makefile.am b/spot/priv/Makefile.am similarity index 93% rename from src/priv/Makefile.am rename to spot/priv/Makefile.am index f22b13205..a42dd0880 100644 --- a/src/priv/Makefile.am +++ b/spot/priv/Makefile.am @@ -17,7 +17,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) noinst_HEADERS = \ diff --git a/src/priv/accmap.hh b/spot/priv/accmap.hh similarity index 97% rename from src/priv/accmap.hh rename to spot/priv/accmap.hh index a1c3bf5ba..b1d2dce95 100644 --- a/src/priv/accmap.hh +++ b/spot/priv/accmap.hh @@ -20,9 +20,9 @@ #pragma once #include -#include "misc/hash.hh" -#include "tl/formula.hh" -#include "twa/twagraph.hh" +#include +#include +#include namespace spot { diff --git a/src/priv/bddalloc.cc b/spot/priv/bddalloc.cc similarity index 98% rename from src/priv/bddalloc.cc rename to spot/priv/bddalloc.cc index 02fea0044..887ac1819 100644 --- a/src/priv/bddalloc.cc +++ b/spot/priv/bddalloc.cc @@ -22,7 +22,7 @@ #include #include -#include "bddalloc.hh" +#include "spot/priv/bddalloc.hh" namespace spot { diff --git a/src/priv/bddalloc.hh b/spot/priv/bddalloc.hh similarity index 98% rename from src/priv/bddalloc.hh rename to spot/priv/bddalloc.hh index 1b201038f..1716e0762 100644 --- a/src/priv/bddalloc.hh +++ b/spot/priv/bddalloc.hh @@ -22,7 +22,7 @@ #pragma once -#include "freelist.hh" +#include "spot/priv/freelist.hh" #include #include diff --git a/src/priv/freelist.cc b/spot/priv/freelist.cc similarity index 99% rename from src/priv/freelist.cc rename to spot/priv/freelist.cc index 9a2c4fce0..3f505b46b 100644 --- a/src/priv/freelist.cc +++ b/spot/priv/freelist.cc @@ -20,7 +20,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "freelist.hh" +#include "spot/priv/freelist.hh" #include #include diff --git a/src/priv/freelist.hh b/spot/priv/freelist.hh similarity index 100% rename from src/priv/freelist.hh rename to spot/priv/freelist.hh diff --git a/src/priv/trim.cc b/spot/priv/trim.cc similarity index 97% rename from src/priv/trim.cc rename to spot/priv/trim.cc index 4124b1bad..2464daa17 100644 --- a/src/priv/trim.cc +++ b/spot/priv/trim.cc @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "trim.hh" +#include #include #include #include diff --git a/src/priv/trim.hh b/spot/priv/trim.hh similarity index 100% rename from src/priv/trim.hh rename to spot/priv/trim.hh diff --git a/src/sanity/.gitignore b/spot/sanity/.gitignore similarity index 100% rename from src/sanity/.gitignore rename to spot/sanity/.gitignore diff --git a/src/sanity/80columns.test b/spot/sanity/80columns.test similarity index 100% rename from src/sanity/80columns.test rename to spot/sanity/80columns.test diff --git a/src/sanity/Makefile.am b/spot/sanity/Makefile.am similarity index 93% rename from src/sanity/Makefile.am rename to spot/sanity/Makefile.am index 121371a4a..71463dbf6 100644 --- a/src/sanity/Makefile.am +++ b/spot/sanity/Makefile.am @@ -20,17 +20,17 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) # Run `make TESTHEADER=foo.hh check' if you want to check only one # header. check-80columns: - INCDIR='$(top_srcdir)/src' \ + INCDIR='$(top_srcdir)/spot' \ $(SHELL) $(srcdir)/80columns.test $(TESTHEADER) check-style: - INCDIR='$(top_srcdir)/src' \ + INCDIR='$(top_srcdir)/spot' \ $(SHELL) $(srcdir)/style.test $(TESTHEADER) check-readme: @@ -45,7 +45,7 @@ check-includes: CXX='$(CXX)' \ CPPFLAGS='$(AM_CPPFLAGS) $(CPPFLAGS) $(DEFS)' \ CXXFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' \ - INCDIR='$(top_srcdir)/src' \ + INCDIR='$(top_srcdir)/spot' \ TOPBUILD='$(top_builddir)' \ $(SHELL) $(srcdir)/includes.test $(TESTHEADER) diff --git a/src/sanity/includes.test b/spot/sanity/includes.test similarity index 100% rename from src/sanity/includes.test rename to spot/sanity/includes.test diff --git a/src/sanity/ipynb.test b/spot/sanity/ipynb.test similarity index 100% rename from src/sanity/ipynb.test rename to spot/sanity/ipynb.test diff --git a/src/sanity/private.test b/spot/sanity/private.test similarity index 100% rename from src/sanity/private.test rename to spot/sanity/private.test diff --git a/src/sanity/readme.test b/spot/sanity/readme.test similarity index 100% rename from src/sanity/readme.test rename to spot/sanity/readme.test diff --git a/src/sanity/style.test b/spot/sanity/style.test similarity index 93% rename from src/sanity/style.test rename to spot/sanity/style.test index b24e405df..68784ea2f 100755 --- a/src/sanity/style.test +++ b/spot/sanity/style.test @@ -130,7 +130,7 @@ for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do perl -pe 'sub f {my $a = shift; $a =~ s:[^\n]*://:g; return "$a"} s,/\*(.*?)\*/,f($1),sge; s,//.*?\n,//\n,g; - s,"(\\.|[^"\\\n])*","",g; + s,(?$tmp $GREP '[ ]$' $tmp && @@ -284,12 +284,17 @@ for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do $GREP '#.*include.*' $tmp && diag 'Avoid in headers, better use .' fi - # Headers from src/priv/ are not installed, so may only be - # included from *.cc files or from other src/priv/ headers + # Headers from spot/priv/ are not installed, so may only be + # included from *.cc files or from other spot/priv/ headers # (in the latter case they do not have to specify the priv/ # directory, so they will not match this regex). - $GREP '#.*include.*priv/' $tmp && - diag 'Do not include private headers in public headers.' + case $file in + */priv/*|*/bin/*);; + *) + $GREP '#.*include.*priv/' $tmp && + diag 'Do not include private headers in public headers.' + ;; + esac ;; *.cc) if $GREP 'namespace$' $tmp >/dev/null; then @@ -301,6 +306,15 @@ for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do fi ;; esac + case $file in + */bin/*|*.cc);; + *) + $GREP -v '#.*include.*priv/' $tmp | $GREP '#.*include.*"' && + diag 'Use
instead of "header" for public headers.' + $GREP '#.*include.*' $tmp && + diag 'Use "spot/priv/..." instead of ".' + ;; + esac ;; esac diff --git a/src/ta/Makefile.am b/spot/ta/Makefile.am similarity index 94% rename from src/ta/Makefile.am rename to spot/ta/Makefile.am index 702af653b..3498fc64f 100644 --- a/src/ta/Makefile.am +++ b/spot/ta/Makefile.am @@ -17,7 +17,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) tadir = $(pkgincludedir)/ta diff --git a/src/ta/ta.cc b/spot/ta/ta.cc similarity index 98% rename from src/ta/ta.cc rename to spot/ta/ta.cc index c8c825eb5..f371beca9 100644 --- a/src/ta/ta.cc +++ b/spot/ta/ta.cc @@ -18,7 +18,7 @@ // along with this program. If not, see . -#include "ta.hh" +#include namespace spot { diff --git a/src/ta/ta.hh b/spot/ta/ta.hh similarity index 99% rename from src/ta/ta.hh rename to spot/ta/ta.hh index e64ac465e..443b3bc10 100644 --- a/src/ta/ta.hh +++ b/spot/ta/ta.hh @@ -22,8 +22,8 @@ #include #include -#include "misc/bddlt.hh" -#include "twa/twa.hh" +#include +#include namespace spot { diff --git a/src/ta/taexplicit.cc b/spot/ta/taexplicit.cc similarity index 99% rename from src/ta/taexplicit.cc rename to spot/ta/taexplicit.cc index 796181746..77c438350 100644 --- a/src/ta/taexplicit.cc +++ b/spot/ta/taexplicit.cc @@ -26,10 +26,10 @@ #define trace while (0) std::clog #endif -#include "taexplicit.hh" -#include "twa/formula2bdd.hh" +#include +#include #include -#include "twa/bddprint.hh" +#include namespace spot { diff --git a/src/ta/taexplicit.hh b/spot/ta/taexplicit.hh similarity index 97% rename from src/ta/taexplicit.hh rename to spot/ta/taexplicit.hh index 38a222660..532ce81f4 100644 --- a/src/ta/taexplicit.hh +++ b/spot/ta/taexplicit.hh @@ -19,14 +19,14 @@ #pragma once -#include "misc/hash.hh" +#include #include -#include "twa/twa.hh" +#include #include -#include "tl/formula.hh" +#include #include -#include "misc/bddlt.hh" -#include "ta.hh" +#include +#include namespace spot { diff --git a/src/ta/taproduct.cc b/spot/ta/taproduct.cc similarity index 99% rename from src/ta/taproduct.cc rename to spot/ta/taproduct.cc index dac0dd17a..86d84c052 100644 --- a/src/ta/taproduct.cc +++ b/spot/ta/taproduct.cc @@ -18,9 +18,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "taproduct.hh" +#include #include -#include "misc/hashfunc.hh" +#include namespace spot { diff --git a/src/ta/taproduct.hh b/spot/ta/taproduct.hh similarity index 98% rename from src/ta/taproduct.hh rename to spot/ta/taproduct.hh index 0db9c070d..8c4d23bb7 100644 --- a/src/ta/taproduct.hh +++ b/spot/ta/taproduct.hh @@ -19,8 +19,8 @@ #pragma once -#include "ta.hh" -#include "kripke/kripke.hh" +#include +#include namespace spot { diff --git a/src/ta/tgta.hh b/spot/ta/tgta.hh similarity index 99% rename from src/ta/tgta.hh rename to spot/ta/tgta.hh index 62b862c29..cae65a6cd 100644 --- a/src/ta/tgta.hh +++ b/spot/ta/tgta.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twa.hh" +#include namespace spot { diff --git a/src/ta/tgtaexplicit.cc b/spot/ta/tgtaexplicit.cc similarity index 94% rename from src/ta/tgtaexplicit.cc rename to spot/ta/tgtaexplicit.cc index f2c2d8548..110f4e109 100644 --- a/src/ta/tgtaexplicit.cc +++ b/spot/ta/tgtaexplicit.cc @@ -17,9 +17,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "tgtaexplicit.hh" -#include "twa/formula2bdd.hh" -#include "twa/bddprint.hh" +#include +#include +#include namespace spot { diff --git a/src/ta/tgtaexplicit.hh b/spot/ta/tgtaexplicit.hh similarity index 92% rename from src/ta/tgtaexplicit.hh rename to spot/ta/tgtaexplicit.hh index d3f19d4e6..7665708c5 100644 --- a/src/ta/tgtaexplicit.hh +++ b/spot/ta/tgtaexplicit.hh @@ -19,15 +19,15 @@ #pragma once -#include "misc/hash.hh" +#include #include -#include "twa/twa.hh" +#include #include -#include "tl/formula.hh" +#include #include -#include "misc/bddlt.hh" -#include "taexplicit.hh" -#include "tgta.hh" +#include +#include +#include namespace spot { diff --git a/src/ta/tgtaproduct.cc b/spot/ta/tgtaproduct.cc similarity index 98% rename from src/ta/tgtaproduct.cc rename to spot/ta/tgtaproduct.cc index 8a444c405..017dc5ade 100644 --- a/src/ta/tgtaproduct.cc +++ b/spot/ta/tgtaproduct.cc @@ -27,11 +27,11 @@ #define trace while (0) std::clog #endif -#include "tgtaproduct.hh" +#include #include #include -#include "misc/hashfunc.hh" -#include "kripke/kripke.hh" +#include +#include namespace spot { diff --git a/src/ta/tgtaproduct.hh b/spot/ta/tgtaproduct.hh similarity index 94% rename from src/ta/tgtaproduct.hh rename to spot/ta/tgtaproduct.hh index 3429a6594..399308e4a 100644 --- a/src/ta/tgtaproduct.hh +++ b/spot/ta/tgtaproduct.hh @@ -19,11 +19,11 @@ #pragma once -#include "twa/twa.hh" -#include "twa/twaproduct.hh" -#include "misc/fixpool.hh" -#include "kripke/kripke.hh" -#include "tgta.hh" +#include +#include +#include +#include +#include namespace spot { diff --git a/src/taalgos/Makefile.am b/spot/taalgos/Makefile.am similarity index 94% rename from src/taalgos/Makefile.am rename to spot/taalgos/Makefile.am index 16dca9ea1..29d15f4a8 100644 --- a/src/taalgos/Makefile.am +++ b/spot/taalgos/Makefile.am @@ -18,7 +18,7 @@ ## along with this program. If not, see . -AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) taalgosdir = $(pkgincludedir)/taalgos diff --git a/src/taalgos/dot.cc b/spot/taalgos/dot.cc similarity index 97% rename from src/taalgos/dot.cc rename to spot/taalgos/dot.cc index 65237b1a3..d2931e19c 100644 --- a/src/taalgos/dot.cc +++ b/spot/taalgos/dot.cc @@ -18,11 +18,11 @@ // along with this program. If not, see . #include -#include "dot.hh" -#include "twa/bddprint.hh" -#include "reachiter.hh" -#include "misc/escape.hh" -#include "misc/bareword.hh" +#include +#include +#include +#include +#include #include #include diff --git a/src/taalgos/dot.hh b/spot/taalgos/dot.hh similarity index 97% rename from src/taalgos/dot.hh rename to spot/taalgos/dot.hh index 0c27dcf70..347070ff6 100644 --- a/src/taalgos/dot.hh +++ b/spot/taalgos/dot.hh @@ -19,7 +19,7 @@ #pragma once -#include "ta/ta.hh" +#include #include namespace spot diff --git a/src/taalgos/emptinessta.cc b/spot/taalgos/emptinessta.cc similarity index 99% rename from src/taalgos/emptinessta.cc rename to spot/taalgos/emptinessta.cc index 11d8b97c1..20afa9675 100644 --- a/src/taalgos/emptinessta.cc +++ b/spot/taalgos/emptinessta.cc @@ -26,10 +26,10 @@ #define trace while (0) std::clog #endif -#include "emptinessta.hh" -#include "misc/memusage.hh" +#include +#include #include -#include "twa/bddprint.hh" +#include namespace spot { diff --git a/src/taalgos/emptinessta.hh b/spot/taalgos/emptinessta.hh similarity index 98% rename from src/taalgos/emptinessta.hh rename to spot/taalgos/emptinessta.hh index cd2e4e63b..4298a6015 100644 --- a/src/taalgos/emptinessta.hh +++ b/spot/taalgos/emptinessta.hh @@ -22,9 +22,9 @@ #pragma once -#include "ta/taproduct.hh" -#include "misc/optionmap.hh" -#include "twaalgos/emptiness_stats.hh" +#include +#include +#include #include #include diff --git a/src/taalgos/minimize.cc b/spot/taalgos/minimize.cc similarity index 98% rename from src/taalgos/minimize.cc rename to spot/taalgos/minimize.cc index cd5daf939..ded2a3d3b 100644 --- a/src/taalgos/minimize.cc +++ b/spot/taalgos/minimize.cc @@ -29,13 +29,13 @@ #include #include #include -#include "minimize.hh" -#include "misc/hash.hh" -#include "misc/bddlt.hh" -#include "ta/tgtaexplicit.hh" -#include "taalgos/statessetbuilder.hh" -#include "twa/twagraph.hh" -#include "twa/bddprint.hh" +#include +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/src/taalgos/minimize.hh b/spot/taalgos/minimize.hh similarity index 96% rename from src/taalgos/minimize.hh rename to spot/taalgos/minimize.hh index 42dac70b8..f844baa96 100644 --- a/src/taalgos/minimize.hh +++ b/spot/taalgos/minimize.hh @@ -19,9 +19,9 @@ #pragma once -#include "ta/ta.hh" -#include "ta/tgta.hh" -#include "ta/tgtaexplicit.hh" +#include +#include +#include namespace spot { diff --git a/src/taalgos/reachiter.cc b/spot/taalgos/reachiter.cc similarity index 99% rename from src/taalgos/reachiter.cc rename to spot/taalgos/reachiter.cc index 1ec9b72ee..3efe7de1b 100644 --- a/src/taalgos/reachiter.cc +++ b/spot/taalgos/reachiter.cc @@ -18,7 +18,7 @@ // along with this program. If not, see . #include -#include "reachiter.hh" +#include #include using namespace std; diff --git a/src/taalgos/reachiter.hh b/spot/taalgos/reachiter.hh similarity index 98% rename from src/taalgos/reachiter.hh rename to spot/taalgos/reachiter.hh index dc5cf6683..242e1fbcf 100644 --- a/src/taalgos/reachiter.hh +++ b/spot/taalgos/reachiter.hh @@ -19,8 +19,8 @@ #pragma once -#include "misc/hash.hh" -#include "ta/ta.hh" +#include +#include #include #include diff --git a/src/taalgos/statessetbuilder.cc b/spot/taalgos/statessetbuilder.cc similarity index 93% rename from src/taalgos/statessetbuilder.cc rename to spot/taalgos/statessetbuilder.cc index 5e1b2c89d..cd94aa33d 100644 --- a/src/taalgos/statessetbuilder.cc +++ b/spot/taalgos/statessetbuilder.cc @@ -18,9 +18,9 @@ // along with this program. If not, see . #include -#include "ta/ta.hh" -#include "statessetbuilder.hh" -#include "reachiter.hh" +#include +#include +#include namespace spot { diff --git a/src/taalgos/statessetbuilder.hh b/spot/taalgos/statessetbuilder.hh similarity index 97% rename from src/taalgos/statessetbuilder.hh rename to spot/taalgos/statessetbuilder.hh index 3b9a7aaf7..245e244cb 100644 --- a/src/taalgos/statessetbuilder.hh +++ b/spot/taalgos/statessetbuilder.hh @@ -19,7 +19,7 @@ #pragma once -#include "ta/ta.hh" +#include namespace spot { diff --git a/src/taalgos/stats.cc b/spot/taalgos/stats.cc similarity index 95% rename from src/taalgos/stats.cc rename to spot/taalgos/stats.cc index 9742cc190..b63fd0109 100644 --- a/src/taalgos/stats.cc +++ b/spot/taalgos/stats.cc @@ -21,9 +21,9 @@ // along with this program. If not, see . #include -#include "ta/ta.hh" -#include "stats.hh" -#include "reachiter.hh" +#include +#include +#include namespace spot { diff --git a/src/taalgos/stats.hh b/spot/taalgos/stats.hh similarity index 97% rename from src/taalgos/stats.hh rename to spot/taalgos/stats.hh index 0853dae03..e6f9553bc 100644 --- a/src/taalgos/stats.hh +++ b/spot/taalgos/stats.hh @@ -19,7 +19,7 @@ #pragma once -#include "ta/ta.hh" +#include #include namespace spot diff --git a/src/taalgos/tgba2ta.cc b/spot/taalgos/tgba2ta.cc similarity index 99% rename from src/taalgos/tgba2ta.cc rename to spot/taalgos/tgba2ta.cc index bf6bc6557..62d46052b 100644 --- a/src/taalgos/tgba2ta.cc +++ b/spot/taalgos/tgba2ta.cc @@ -26,14 +26,14 @@ #define trace while (0) std::clog #endif -#include "twa/formula2bdd.hh" +#include #include #include -#include "twa/bddprint.hh" +#include #include -#include "tgba2ta.hh" -#include "taalgos/statessetbuilder.hh" -#include "ta/tgtaexplicit.hh" +#include +#include +#include using namespace std; diff --git a/src/taalgos/tgba2ta.hh b/spot/taalgos/tgba2ta.hh similarity index 97% rename from src/taalgos/tgba2ta.hh rename to spot/taalgos/tgba2ta.hh index 5e66a0ea7..37da3bd65 100644 --- a/src/taalgos/tgba2ta.hh +++ b/spot/taalgos/tgba2ta.hh @@ -19,9 +19,9 @@ #pragma once -#include "twa/twa.hh" -#include "ta/taexplicit.hh" -#include "ta/tgtaexplicit.hh" +#include +#include +#include namespace spot { diff --git a/src/tests/.gitignore b/spot/tests/.gitignore similarity index 100% rename from src/tests/.gitignore rename to spot/tests/.gitignore diff --git a/src/tests/Makefile.am b/spot/tests/Makefile.am similarity index 98% rename from src/tests/Makefile.am rename to spot/tests/Makefile.am index 75ea2fa42..2cb7c301a 100644 --- a/src/tests/Makefile.am +++ b/spot/tests/Makefile.am @@ -20,7 +20,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) LDADD = ../libspot.la diff --git a/src/tests/acc.cc b/spot/tests/acc.cc similarity index 99% rename from src/tests/acc.cc rename to spot/tests/acc.cc index eda001656..a019982d6 100644 --- a/src/tests/acc.cc +++ b/spot/tests/acc.cc @@ -22,7 +22,7 @@ #include #include #include -#include "twa/acc.hh" +#include static void check(spot::acc_cond& ac, spot::acc_cond::mark_t m) { diff --git a/src/tests/acc.test b/spot/tests/acc.test similarity index 100% rename from src/tests/acc.test rename to spot/tests/acc.test diff --git a/src/tests/acc2.test b/spot/tests/acc2.test similarity index 100% rename from src/tests/acc2.test rename to spot/tests/acc2.test diff --git a/src/tests/babiak.test b/spot/tests/babiak.test similarity index 100% rename from src/tests/babiak.test rename to spot/tests/babiak.test diff --git a/src/tests/bare.test b/spot/tests/bare.test similarity index 100% rename from src/tests/bare.test rename to spot/tests/bare.test diff --git a/src/tests/basimul.test b/spot/tests/basimul.test similarity index 100% rename from src/tests/basimul.test rename to spot/tests/basimul.test diff --git a/src/tests/bitvect.cc b/spot/tests/bitvect.cc similarity index 98% rename from src/tests/bitvect.cc rename to spot/tests/bitvect.cc index 3abd556f0..4dd281369 100644 --- a/src/tests/bitvect.cc +++ b/spot/tests/bitvect.cc @@ -18,7 +18,7 @@ // along with this program. If not, see . #include -#include "misc/bitvect.hh" +#include static void ruler() { diff --git a/src/tests/bitvect.test b/spot/tests/bitvect.test similarity index 100% rename from src/tests/bitvect.test rename to spot/tests/bitvect.test diff --git a/src/tests/checkpsl.cc b/spot/tests/checkpsl.cc similarity index 92% rename from src/tests/checkpsl.cc rename to spot/tests/checkpsl.cc index b0432813d..3dde7e3b5 100644 --- a/src/tests/checkpsl.cc +++ b/spot/tests/checkpsl.cc @@ -22,12 +22,12 @@ #include #include #include -#include "tl/parse.hh" -#include "twaalgos/ltl2tgba_fm.hh" -#include "twaalgos/ltl2taa.hh" -#include "twaalgos/sccfilter.hh" -#include "twaalgos/product.hh" -#include "twaalgos/dot.hh" +#include +#include +#include +#include +#include +#include static void syntax(char* prog) diff --git a/src/tests/checkta.cc b/spot/tests/checkta.cc similarity index 95% rename from src/tests/checkta.cc rename to spot/tests/checkta.cc index eec5d5062..a5fdb97b7 100644 --- a/src/tests/checkta.cc +++ b/spot/tests/checkta.cc @@ -23,15 +23,15 @@ #include #include #include -#include "tl/parse.hh" -#include "twaalgos/ltl2tgba_fm.hh" -#include "twaalgos/sccfilter.hh" -#include "twaalgos/degen.hh" -#include "twaalgos/stats.hh" -#include "taalgos/minimize.hh" -#include "taalgos/tgba2ta.hh" -#include "taalgos/dot.hh" -#include "taalgos/stats.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include static void syntax(char* prog) diff --git a/src/tests/complement.test b/spot/tests/complement.test similarity index 100% rename from src/tests/complement.test rename to spot/tests/complement.test diff --git a/src/tests/complementation.cc b/spot/tests/complementation.cc similarity index 93% rename from src/tests/complementation.cc rename to spot/tests/complementation.cc index 0574e64c5..0f8df8a30 100644 --- a/src/tests/complementation.cc +++ b/spot/tests/complementation.cc @@ -19,20 +19,20 @@ #include #include -#include "twaalgos/dot.hh" -#include "twaalgos/hoa.hh" -#include "parseaut/public.hh" -#include "twa/twaproduct.hh" -#include "twaalgos/gtec/gtec.hh" -#include "twaalgos/ltl2tgba_fm.hh" -#include "tl/parse.hh" -#include "twaalgos/stats.hh" -#include "twaalgos/emptiness.hh" -#include "twaalgos/stats.hh" -#include "twaalgos/emptiness_stats.hh" -#include "twaalgos/degen.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "twa/twasafracomplement.hh" +#include static void usage(const char* prog) { diff --git a/src/tests/complementation.test b/spot/tests/complementation.test similarity index 100% rename from src/tests/complementation.test rename to spot/tests/complementation.test diff --git a/src/tests/complete.test b/spot/tests/complete.test similarity index 100% rename from src/tests/complete.test rename to spot/tests/complete.test diff --git a/src/tests/consterm.cc b/spot/tests/consterm.cc similarity index 98% rename from src/tests/consterm.cc rename to spot/tests/consterm.cc index a8fca3dfe..d11289327 100644 --- a/src/tests/consterm.cc +++ b/spot/tests/consterm.cc @@ -22,7 +22,7 @@ #include #include #include -#include "tl/parse.hh" +#include static void syntax(char *prog) diff --git a/src/tests/consterm.test b/spot/tests/consterm.test similarity index 100% rename from src/tests/consterm.test rename to spot/tests/consterm.test diff --git a/src/tests/cycles.test b/spot/tests/cycles.test similarity index 100% rename from src/tests/cycles.test rename to spot/tests/cycles.test diff --git a/src/tests/dbacomp.test b/spot/tests/dbacomp.test similarity index 100% rename from src/tests/dbacomp.test rename to spot/tests/dbacomp.test diff --git a/src/tests/defs.in b/spot/tests/defs.in similarity index 100% rename from src/tests/defs.in rename to spot/tests/defs.in diff --git a/src/tests/degendet.test b/spot/tests/degendet.test similarity index 100% rename from src/tests/degendet.test rename to spot/tests/degendet.test diff --git a/src/tests/degenid.test b/spot/tests/degenid.test similarity index 100% rename from src/tests/degenid.test rename to spot/tests/degenid.test diff --git a/src/tests/degenlskip.test b/spot/tests/degenlskip.test similarity index 100% rename from src/tests/degenlskip.test rename to spot/tests/degenlskip.test diff --git a/src/tests/det.test b/spot/tests/det.test similarity index 100% rename from src/tests/det.test rename to spot/tests/det.test diff --git a/src/tests/dfs.test b/spot/tests/dfs.test similarity index 100% rename from src/tests/dfs.test rename to spot/tests/dfs.test diff --git a/src/tests/dra2dba.test b/spot/tests/dra2dba.test similarity index 100% rename from src/tests/dra2dba.test rename to spot/tests/dra2dba.test diff --git a/src/tests/dstar.test b/spot/tests/dstar.test similarity index 100% rename from src/tests/dstar.test rename to spot/tests/dstar.test diff --git a/src/tests/dupexp.test b/spot/tests/dupexp.test similarity index 100% rename from src/tests/dupexp.test rename to spot/tests/dupexp.test diff --git a/src/tests/emptchk.cc b/spot/tests/emptchk.cc similarity index 93% rename from src/tests/emptchk.cc rename to spot/tests/emptchk.cc index c50343889..75cde5a27 100644 --- a/src/tests/emptchk.cc +++ b/spot/tests/emptchk.cc @@ -22,15 +22,15 @@ #include #include #include -#include "tl/parse.hh" -#include "twaalgos/ltl2tgba_fm.hh" -#include "twaalgos/ltl2taa.hh" -#include "twaalgos/sccfilter.hh" -#include "twaalgos/degen.hh" -#include "twa/twaproduct.hh" -#include "twaalgos/gtec/gtec.hh" -#include "twaalgos/dot.hh" -#include "twaalgos/emptiness.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include static void syntax(char* prog) diff --git a/src/tests/emptchk.test b/spot/tests/emptchk.test similarity index 100% rename from src/tests/emptchk.test rename to spot/tests/emptchk.test diff --git a/src/tests/emptchke.test b/spot/tests/emptchke.test similarity index 100% rename from src/tests/emptchke.test rename to spot/tests/emptchke.test diff --git a/src/tests/emptchkr.test b/spot/tests/emptchkr.test similarity index 100% rename from src/tests/emptchkr.test rename to spot/tests/emptchkr.test diff --git a/src/tests/equals.test b/spot/tests/equals.test similarity index 100% rename from src/tests/equals.test rename to spot/tests/equals.test diff --git a/src/tests/equalsf.cc b/spot/tests/equalsf.cc similarity index 97% rename from src/tests/equalsf.cc rename to spot/tests/equalsf.cc index b73188aff..46a1bd633 100644 --- a/src/tests/equalsf.cc +++ b/spot/tests/equalsf.cc @@ -26,11 +26,11 @@ #include #include #include -#include "tl/parse.hh" -#include "tl/unabbrev.hh" -#include "tl/nenoform.hh" -#include "tl/simplify.hh" -#include "tl/print.hh" +#include +#include +#include +#include +#include static void syntax(char* prog) diff --git a/src/tests/eventuniv.test b/spot/tests/eventuniv.test similarity index 100% rename from src/tests/eventuniv.test rename to spot/tests/eventuniv.test diff --git a/src/tests/exclusive-ltl.test b/spot/tests/exclusive-ltl.test similarity index 100% rename from src/tests/exclusive-ltl.test rename to spot/tests/exclusive-ltl.test diff --git a/src/tests/exclusive-tgba.test b/spot/tests/exclusive-tgba.test similarity index 100% rename from src/tests/exclusive-tgba.test rename to spot/tests/exclusive-tgba.test diff --git a/src/tests/explpro2.test b/spot/tests/explpro2.test similarity index 100% rename from src/tests/explpro2.test rename to spot/tests/explpro2.test diff --git a/src/tests/explpro3.test b/spot/tests/explpro3.test similarity index 100% rename from src/tests/explpro3.test rename to spot/tests/explpro3.test diff --git a/src/tests/explpro4.test b/spot/tests/explpro4.test similarity index 100% rename from src/tests/explpro4.test rename to spot/tests/explpro4.test diff --git a/src/tests/explprod.test b/spot/tests/explprod.test similarity index 100% rename from src/tests/explprod.test rename to spot/tests/explprod.test diff --git a/src/tests/graph.cc b/spot/tests/graph.cc similarity index 99% rename from src/tests/graph.cc rename to spot/tests/graph.cc index 8661a796f..da224926d 100644 --- a/src/tests/graph.cc +++ b/spot/tests/graph.cc @@ -19,7 +19,7 @@ #include -#include "graph/graph.hh" +#include template void diff --git a/src/tests/graph.test b/spot/tests/graph.test similarity index 100% rename from src/tests/graph.test rename to spot/tests/graph.test diff --git a/src/tests/ikwiad.cc b/spot/tests/ikwiad.cc similarity index 96% rename from src/tests/ikwiad.cc rename to spot/tests/ikwiad.cc index 7212619b3..2669cbc65 100644 --- a/src/tests/ikwiad.cc +++ b/spot/tests/ikwiad.cc @@ -26,48 +26,48 @@ #include #include #include -#include "tl/print.hh" -#include "tl/apcollect.hh" -#include "tl/formula.hh" -#include "tl/parse.hh" -#include "twaalgos/ltl2tgba_fm.hh" -#include "twaalgos/ltl2taa.hh" -#include "twa/bddprint.hh" -#include "twaalgos/dot.hh" -#include "twaalgos/lbtt.hh" -#include "twaalgos/hoa.hh" -#include "twaalgos/degen.hh" -#include "twa/twaproduct.hh" -#include "parseaut/public.hh" -#include "twaalgos/copy.hh" -#include "twaalgos/minimize.hh" -#include "taalgos/minimize.hh" -#include "twaalgos/neverclaim.hh" -#include "twaalgos/sccfilter.hh" -#include "twaalgos/strength.hh" -#include "twaalgos/gtec/gtec.hh" -#include "misc/timer.hh" -#include "twaalgos/stats.hh" -#include "twaalgos/sccinfo.hh" -#include "twaalgos/emptiness_stats.hh" -#include "twaalgos/sccinfo.hh" -#include "twaalgos/isdet.hh" -#include "twaalgos/cycles.hh" -#include "twaalgos/isweakscc.hh" -#include "twaalgos/simulation.hh" -#include "twaalgos/compsusp.hh" -#include "twaalgos/powerset.hh" -#include "twaalgos/complement.hh" -#include "twaalgos/remfin.hh" -#include "twaalgos/complete.hh" -#include "twaalgos/dtbasat.hh" -#include "twaalgos/dtwasat.hh" -#include "twaalgos/stutter.hh" -#include "twaalgos/totgba.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "taalgos/tgba2ta.hh" -#include "taalgos/dot.hh" -#include "taalgos/stats.hh" +#include +#include +#include static void syntax(char* prog) diff --git a/src/tests/intvcmp2.cc b/spot/tests/intvcmp2.cc similarity index 99% rename from src/tests/intvcmp2.cc rename to spot/tests/intvcmp2.cc index 9cf453216..bced7a904 100644 --- a/src/tests/intvcmp2.cc +++ b/spot/tests/intvcmp2.cc @@ -18,7 +18,7 @@ // along with this program. If not, see . #include -#include "misc/intvcmp2.hh" +#include #include diff --git a/src/tests/intvcomp.cc b/spot/tests/intvcomp.cc similarity index 99% rename from src/tests/intvcomp.cc rename to spot/tests/intvcomp.cc index 3f0205b8b..b65cef8cd 100644 --- a/src/tests/intvcomp.cc +++ b/spot/tests/intvcomp.cc @@ -18,7 +18,7 @@ // along with this program. If not, see . #include -#include "misc/intvcomp.hh" +#include #include static int diff --git a/src/tests/intvcomp.test b/spot/tests/intvcomp.test similarity index 100% rename from src/tests/intvcomp.test rename to spot/tests/intvcomp.test diff --git a/src/tests/isomorph.test b/spot/tests/isomorph.test similarity index 100% rename from src/tests/isomorph.test rename to spot/tests/isomorph.test diff --git a/src/tests/isop.test b/spot/tests/isop.test similarity index 100% rename from src/tests/isop.test rename to spot/tests/isop.test diff --git a/src/tests/kind.cc b/spot/tests/kind.cc similarity index 98% rename from src/tests/kind.cc rename to spot/tests/kind.cc index d628bf9ac..e596f3406 100644 --- a/src/tests/kind.cc +++ b/spot/tests/kind.cc @@ -22,7 +22,7 @@ #include #include #include -#include "tl/parse.hh" +#include static void syntax(char *prog) diff --git a/src/tests/kind.test b/spot/tests/kind.test similarity index 100% rename from src/tests/kind.test rename to spot/tests/kind.test diff --git a/src/tests/kripke.test b/spot/tests/kripke.test similarity index 100% rename from src/tests/kripke.test rename to spot/tests/kripke.test diff --git a/src/tests/latex.test b/spot/tests/latex.test similarity index 100% rename from src/tests/latex.test rename to spot/tests/latex.test diff --git a/src/tests/lbt.test b/spot/tests/lbt.test similarity index 100% rename from src/tests/lbt.test rename to spot/tests/lbt.test diff --git a/src/tests/lbttparse.test b/spot/tests/lbttparse.test similarity index 100% rename from src/tests/lbttparse.test rename to spot/tests/lbttparse.test diff --git a/src/tests/length.cc b/spot/tests/length.cc similarity index 96% rename from src/tests/length.cc rename to spot/tests/length.cc index 7f367ca16..c5e12be77 100644 --- a/src/tests/length.cc +++ b/spot/tests/length.cc @@ -21,8 +21,8 @@ #include #include #include -#include "tl/parse.hh" -#include "tl/length.hh" +#include +#include static void syntax(char *prog) diff --git a/src/tests/length.test b/spot/tests/length.test similarity index 100% rename from src/tests/length.test rename to spot/tests/length.test diff --git a/src/tests/lenient.test b/spot/tests/lenient.test similarity index 100% rename from src/tests/lenient.test rename to spot/tests/lenient.test diff --git a/src/tests/ltl2dstar.test b/spot/tests/ltl2dstar.test similarity index 100% rename from src/tests/ltl2dstar.test rename to spot/tests/ltl2dstar.test diff --git a/src/tests/ltl2dstar2.test b/spot/tests/ltl2dstar2.test similarity index 100% rename from src/tests/ltl2dstar2.test rename to spot/tests/ltl2dstar2.test diff --git a/src/tests/ltl2dstar3.test b/spot/tests/ltl2dstar3.test similarity index 100% rename from src/tests/ltl2dstar3.test rename to spot/tests/ltl2dstar3.test diff --git a/src/tests/ltl2dstar4.test b/spot/tests/ltl2dstar4.test similarity index 100% rename from src/tests/ltl2dstar4.test rename to spot/tests/ltl2dstar4.test diff --git a/src/tests/ltl2neverclaim-lbtt.test b/spot/tests/ltl2neverclaim-lbtt.test similarity index 100% rename from src/tests/ltl2neverclaim-lbtt.test rename to spot/tests/ltl2neverclaim-lbtt.test diff --git a/src/tests/ltl2neverclaim.test b/spot/tests/ltl2neverclaim.test similarity index 100% rename from src/tests/ltl2neverclaim.test rename to spot/tests/ltl2neverclaim.test diff --git a/src/tests/ltl2ta.test b/spot/tests/ltl2ta.test similarity index 100% rename from src/tests/ltl2ta.test rename to spot/tests/ltl2ta.test diff --git a/src/tests/ltl2ta2.test b/spot/tests/ltl2ta2.test similarity index 100% rename from src/tests/ltl2ta2.test rename to spot/tests/ltl2ta2.test diff --git a/src/tests/ltl2tgba.test b/spot/tests/ltl2tgba.test similarity index 100% rename from src/tests/ltl2tgba.test rename to spot/tests/ltl2tgba.test diff --git a/src/tests/ltl3dra.test b/spot/tests/ltl3dra.test similarity index 100% rename from src/tests/ltl3dra.test rename to spot/tests/ltl3dra.test diff --git a/src/tests/ltlcounter.test b/spot/tests/ltlcounter.test similarity index 100% rename from src/tests/ltlcounter.test rename to spot/tests/ltlcounter.test diff --git a/src/tests/ltlcross.test b/spot/tests/ltlcross.test similarity index 100% rename from src/tests/ltlcross.test rename to spot/tests/ltlcross.test diff --git a/src/tests/ltlcross2.test b/spot/tests/ltlcross2.test similarity index 100% rename from src/tests/ltlcross2.test rename to spot/tests/ltlcross2.test diff --git a/src/tests/ltlcross3.test b/spot/tests/ltlcross3.test similarity index 100% rename from src/tests/ltlcross3.test rename to spot/tests/ltlcross3.test diff --git a/src/tests/ltlcross4.test b/spot/tests/ltlcross4.test similarity index 100% rename from src/tests/ltlcross4.test rename to spot/tests/ltlcross4.test diff --git a/src/tests/ltlcrossce.test b/spot/tests/ltlcrossce.test similarity index 100% rename from src/tests/ltlcrossce.test rename to spot/tests/ltlcrossce.test diff --git a/src/tests/ltlcrossce2.test b/spot/tests/ltlcrossce2.test similarity index 100% rename from src/tests/ltlcrossce2.test rename to spot/tests/ltlcrossce2.test diff --git a/src/tests/ltlcrossgrind.test b/spot/tests/ltlcrossgrind.test similarity index 100% rename from src/tests/ltlcrossgrind.test rename to spot/tests/ltlcrossgrind.test diff --git a/src/tests/ltldo.test b/spot/tests/ltldo.test similarity index 100% rename from src/tests/ltldo.test rename to spot/tests/ltldo.test diff --git a/src/tests/ltldo2.test b/spot/tests/ltldo2.test similarity index 100% rename from src/tests/ltldo2.test rename to spot/tests/ltldo2.test diff --git a/src/tests/ltlfilt.test b/spot/tests/ltlfilt.test similarity index 100% rename from src/tests/ltlfilt.test rename to spot/tests/ltlfilt.test diff --git a/src/tests/ltlgrind.test b/spot/tests/ltlgrind.test similarity index 100% rename from src/tests/ltlgrind.test rename to spot/tests/ltlgrind.test diff --git a/src/tests/ltlprod.cc b/spot/tests/ltlprod.cc similarity index 93% rename from src/tests/ltlprod.cc rename to spot/tests/ltlprod.cc index b981763cb..168d067d2 100644 --- a/src/tests/ltlprod.cc +++ b/spot/tests/ltlprod.cc @@ -23,10 +23,10 @@ #include #include #include -#include "tl/parse.hh" -#include "twaalgos/product.hh" -#include "twaalgos/ltl2tgba_fm.hh" -#include "twaalgos/dot.hh" +#include +#include +#include +#include static void syntax(char* prog) diff --git a/src/tests/ltlprod.test b/spot/tests/ltlprod.test similarity index 100% rename from src/tests/ltlprod.test rename to spot/tests/ltlprod.test diff --git a/src/tests/ltlrel.cc b/spot/tests/ltlrel.cc similarity index 95% rename from src/tests/ltlrel.cc rename to spot/tests/ltlrel.cc index 9bd5c06e0..c186fc90c 100644 --- a/src/tests/ltlrel.cc +++ b/spot/tests/ltlrel.cc @@ -20,9 +20,9 @@ #include #include #include -#include "tl/parse.hh" -#include "tl/relabel.hh" -#include "tl/print.hh" +#include +#include +#include static void syntax(char *prog) diff --git a/src/tests/ltlrel.test b/spot/tests/ltlrel.test similarity index 100% rename from src/tests/ltlrel.test rename to spot/tests/ltlrel.test diff --git a/src/tests/lunabbrev.test b/spot/tests/lunabbrev.test similarity index 100% rename from src/tests/lunabbrev.test rename to spot/tests/lunabbrev.test diff --git a/src/tests/maskacc.test b/spot/tests/maskacc.test similarity index 100% rename from src/tests/maskacc.test rename to spot/tests/maskacc.test diff --git a/src/tests/maskkeep.test b/spot/tests/maskkeep.test similarity index 100% rename from src/tests/maskkeep.test rename to spot/tests/maskkeep.test diff --git a/src/tests/monitor.test b/spot/tests/monitor.test similarity index 100% rename from src/tests/monitor.test rename to spot/tests/monitor.test diff --git a/src/tests/nenoform.test b/spot/tests/nenoform.test similarity index 100% rename from src/tests/nenoform.test rename to spot/tests/nenoform.test diff --git a/src/tests/neverclaimread.test b/spot/tests/neverclaimread.test similarity index 100% rename from src/tests/neverclaimread.test rename to spot/tests/neverclaimread.test diff --git a/src/tests/ngraph.cc b/spot/tests/ngraph.cc similarity index 99% rename from src/tests/ngraph.cc rename to spot/tests/ngraph.cc index cee07fba3..c433e86b9 100644 --- a/src/tests/ngraph.cc +++ b/spot/tests/ngraph.cc @@ -19,8 +19,8 @@ #include -#include "graph/ngraph.hh" -#include "twa/twa.hh" +#include +#include template void diff --git a/src/tests/ngraph.test b/spot/tests/ngraph.test similarity index 100% rename from src/tests/ngraph.test rename to spot/tests/ngraph.test diff --git a/src/tests/nondet.test b/spot/tests/nondet.test similarity index 100% rename from src/tests/nondet.test rename to spot/tests/nondet.test diff --git a/src/tests/obligation.test b/spot/tests/obligation.test similarity index 100% rename from src/tests/obligation.test rename to spot/tests/obligation.test diff --git a/src/tests/optba.test b/spot/tests/optba.test similarity index 100% rename from src/tests/optba.test rename to spot/tests/optba.test diff --git a/src/tests/origin b/spot/tests/origin similarity index 100% rename from src/tests/origin rename to spot/tests/origin diff --git a/src/tests/parse.test b/spot/tests/parse.test similarity index 100% rename from src/tests/parse.test rename to spot/tests/parse.test diff --git a/src/tests/parse_print_test.cc b/spot/tests/parse_print_test.cc similarity index 95% rename from src/tests/parse_print_test.cc rename to spot/tests/parse_print_test.cc index 83bb4d1fe..5b6dcb1c0 100644 --- a/src/tests/parse_print_test.cc +++ b/spot/tests/parse_print_test.cc @@ -18,8 +18,8 @@ // along with this program. If not, see . -#include "parseaut/public.hh" -#include "twaalgos/hoa.hh" +#include +#include using namespace spot; diff --git a/src/tests/parseaut.test b/spot/tests/parseaut.test similarity index 100% rename from src/tests/parseaut.test rename to spot/tests/parseaut.test diff --git a/src/tests/parseerr.test b/spot/tests/parseerr.test similarity index 100% rename from src/tests/parseerr.test rename to spot/tests/parseerr.test diff --git a/src/tests/prodor.test b/spot/tests/prodor.test similarity index 100% rename from src/tests/prodor.test rename to spot/tests/prodor.test diff --git a/src/tests/rand.test b/spot/tests/rand.test similarity index 100% rename from src/tests/rand.test rename to spot/tests/rand.test diff --git a/src/tests/randaut.test b/spot/tests/randaut.test similarity index 100% rename from src/tests/randaut.test rename to spot/tests/randaut.test diff --git a/src/tests/randomize.test b/spot/tests/randomize.test similarity index 100% rename from src/tests/randomize.test rename to spot/tests/randomize.test diff --git a/src/tests/randpsl.test b/spot/tests/randpsl.test similarity index 100% rename from src/tests/randpsl.test rename to spot/tests/randpsl.test diff --git a/src/tests/randtgba.cc b/spot/tests/randtgba.cc similarity index 98% rename from src/tests/randtgba.cc rename to spot/tests/randtgba.cc index 861894d81..34f39bce6 100644 --- a/src/tests/randtgba.cc +++ b/spot/tests/randtgba.cc @@ -30,27 +30,27 @@ #include #include #include -#include "tl/parse.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 "tl/defaultenv.hh" -#include "twaalgos/dot.hh" -#include "misc/random.hh" -#include "misc/optionmap.hh" -#include "twaalgos/degen.hh" -#include "twaalgos/product.hh" -#include "misc/timer.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "twaalgos/ltl2tgba_fm.hh" +#include -#include "twaalgos/emptiness.hh" -#include "twaalgos/emptiness_stats.hh" +#include +#include struct ec_algo { diff --git a/src/tests/randtgba.test b/spot/tests/randtgba.test similarity index 100% rename from src/tests/randtgba.test rename to spot/tests/randtgba.test diff --git a/src/tests/readltl.cc b/spot/tests/readltl.cc similarity index 97% rename from src/tests/readltl.cc rename to spot/tests/readltl.cc index 303bb5bee..eb35a930b 100644 --- a/src/tests/readltl.cc +++ b/spot/tests/readltl.cc @@ -24,8 +24,8 @@ #include #include #include -#include "tl/parse.hh" -#include "tl/dot.hh" +#include +#include static void syntax(char* prog) diff --git a/src/tests/readsat.cc b/spot/tests/readsat.cc similarity index 96% rename from src/tests/readsat.cc rename to spot/tests/readsat.cc index 1559396bc..e661ee466 100644 --- a/src/tests/readsat.cc +++ b/spot/tests/readsat.cc @@ -18,7 +18,7 @@ // along with this program. If not, see . #include -#include "misc/satsolver.hh" +#include int main() { diff --git a/src/tests/readsat.test b/spot/tests/readsat.test similarity index 100% rename from src/tests/readsat.test rename to spot/tests/readsat.test diff --git a/src/tests/readsave.test b/spot/tests/readsave.test similarity index 100% rename from src/tests/readsave.test rename to spot/tests/readsave.test diff --git a/src/tests/reduc.cc b/spot/tests/reduc.cc similarity index 98% rename from src/tests/reduc.cc rename to spot/tests/reduc.cc index 60298c67c..0e073043c 100644 --- a/src/tests/reduc.cc +++ b/spot/tests/reduc.cc @@ -26,10 +26,10 @@ #include #include #include -#include "tl/parse.hh" -#include "tl/print.hh" -#include "tl/simplify.hh" -#include "tl/length.hh" +#include +#include +#include +#include static void syntax(char* prog) diff --git a/src/tests/reduc.test b/spot/tests/reduc.test similarity index 100% rename from src/tests/reduc.test rename to spot/tests/reduc.test diff --git a/src/tests/reduc0.test b/spot/tests/reduc0.test similarity index 100% rename from src/tests/reduc0.test rename to spot/tests/reduc0.test diff --git a/src/tests/reduccmp.test b/spot/tests/reduccmp.test similarity index 100% rename from src/tests/reduccmp.test rename to spot/tests/reduccmp.test diff --git a/src/tests/reducpsl.test b/spot/tests/reducpsl.test similarity index 100% rename from src/tests/reducpsl.test rename to spot/tests/reducpsl.test diff --git a/src/tests/remfin.test b/spot/tests/remfin.test similarity index 100% rename from src/tests/remfin.test rename to spot/tests/remfin.test diff --git a/src/tests/remove_x.test b/spot/tests/remove_x.test similarity index 100% rename from src/tests/remove_x.test rename to spot/tests/remove_x.test diff --git a/src/tests/remprop.test b/spot/tests/remprop.test similarity index 100% rename from src/tests/remprop.test rename to spot/tests/remprop.test diff --git a/src/tests/renault.test b/spot/tests/renault.test similarity index 100% rename from src/tests/renault.test rename to spot/tests/renault.test diff --git a/src/tests/satmin.test b/spot/tests/satmin.test similarity index 100% rename from src/tests/satmin.test rename to spot/tests/satmin.test diff --git a/src/tests/satmin2.test b/spot/tests/satmin2.test similarity index 100% rename from src/tests/satmin2.test rename to spot/tests/satmin2.test diff --git a/src/tests/sbacc.test b/spot/tests/sbacc.test similarity index 100% rename from src/tests/sbacc.test rename to spot/tests/sbacc.test diff --git a/src/tests/scc.test b/spot/tests/scc.test similarity index 100% rename from src/tests/scc.test rename to spot/tests/scc.test diff --git a/src/tests/sccdot.test b/spot/tests/sccdot.test similarity index 100% rename from src/tests/sccdot.test rename to spot/tests/sccdot.test diff --git a/src/tests/sccsimpl.test b/spot/tests/sccsimpl.test similarity index 100% rename from src/tests/sccsimpl.test rename to spot/tests/sccsimpl.test diff --git a/src/tests/sepsets.test b/spot/tests/sepsets.test similarity index 100% rename from src/tests/sepsets.test rename to spot/tests/sepsets.test diff --git a/src/tests/sim2.test b/spot/tests/sim2.test similarity index 100% rename from src/tests/sim2.test rename to spot/tests/sim2.test diff --git a/src/tests/sim3.test b/spot/tests/sim3.test similarity index 100% rename from src/tests/sim3.test rename to spot/tests/sim3.test diff --git a/src/tests/simdet.test b/spot/tests/simdet.test similarity index 100% rename from src/tests/simdet.test rename to spot/tests/simdet.test diff --git a/src/tests/spotlbtt.test b/spot/tests/spotlbtt.test similarity index 100% rename from src/tests/spotlbtt.test rename to spot/tests/spotlbtt.test diff --git a/src/tests/spotlbtt2.test b/spot/tests/spotlbtt2.test similarity index 100% rename from src/tests/spotlbtt2.test rename to spot/tests/spotlbtt2.test diff --git a/src/tests/strength.test b/spot/tests/strength.test similarity index 100% rename from src/tests/strength.test rename to spot/tests/strength.test diff --git a/src/tests/stutter-ltl.test b/spot/tests/stutter-ltl.test similarity index 100% rename from src/tests/stutter-ltl.test rename to spot/tests/stutter-ltl.test diff --git a/src/tests/stutter-tgba.test b/spot/tests/stutter-tgba.test similarity index 100% rename from src/tests/stutter-tgba.test rename to spot/tests/stutter-tgba.test diff --git a/src/tests/syntimpl.cc b/spot/tests/syntimpl.cc similarity index 95% rename from src/tests/syntimpl.cc rename to spot/tests/syntimpl.cc index 3dcd786a0..7dbe87d50 100644 --- a/src/tests/syntimpl.cc +++ b/spot/tests/syntimpl.cc @@ -23,10 +23,10 @@ #include #include #include -#include "tl/parse.hh" -#include "tl/print.hh" -#include "tl/simplify.hh" -#include "tl/nenoform.hh" +#include +#include +#include +#include static void syntax(char* prog) diff --git a/src/tests/syntimpl.test b/spot/tests/syntimpl.test similarity index 100% rename from src/tests/syntimpl.test rename to spot/tests/syntimpl.test diff --git a/src/tests/taatgba.cc b/spot/tests/taatgba.cc similarity index 92% rename from src/tests/taatgba.cc rename to spot/tests/taatgba.cc index 57a822058..8ebf4f1f6 100644 --- a/src/tests/taatgba.cc +++ b/spot/tests/taatgba.cc @@ -19,10 +19,10 @@ #include #include -#include "misc/hash.hh" -#include "tl/defaultenv.hh" -#include "twaalgos/dot.hh" -#include "twa/taatgba.hh" +#include +#include +#include +#include int main() diff --git a/src/tests/taatgba.test b/spot/tests/taatgba.test similarity index 100% rename from src/tests/taatgba.test rename to spot/tests/taatgba.test diff --git a/src/tests/tgbagraph.test b/spot/tests/tgbagraph.test similarity index 100% rename from src/tests/tgbagraph.test rename to spot/tests/tgbagraph.test diff --git a/src/tests/tostring.cc b/spot/tests/tostring.cc similarity index 97% rename from src/tests/tostring.cc rename to spot/tests/tostring.cc index 3e4c8ab85..5b7477118 100644 --- a/src/tests/tostring.cc +++ b/spot/tests/tostring.cc @@ -23,8 +23,8 @@ #include #include #include -#include "tl/parse.hh" -#include "tl/print.hh" +#include +#include static void syntax(char *prog) diff --git a/src/tests/tostring.test b/spot/tests/tostring.test similarity index 100% rename from src/tests/tostring.test rename to spot/tests/tostring.test diff --git a/src/tests/tripprod.test b/spot/tests/tripprod.test similarity index 100% rename from src/tests/tripprod.test rename to spot/tests/tripprod.test diff --git a/src/tests/tunabbrev.test b/spot/tests/tunabbrev.test similarity index 100% rename from src/tests/tunabbrev.test rename to spot/tests/tunabbrev.test diff --git a/src/tests/tunenoform.test b/spot/tests/tunenoform.test similarity index 100% rename from src/tests/tunenoform.test rename to spot/tests/tunenoform.test diff --git a/src/tests/twagraph.cc b/spot/tests/twagraph.cc similarity index 96% rename from src/tests/twagraph.cc rename to spot/tests/twagraph.cc index e6f2c6e0d..36b7b90eb 100644 --- a/src/tests/twagraph.cc +++ b/spot/tests/twagraph.cc @@ -19,9 +19,9 @@ #include -#include "twa/twagraph.hh" -#include "twaalgos/dot.hh" -#include "tl/defaultenv.hh" +#include +#include +#include static void f1() { diff --git a/src/tests/unabbrevwm.test b/spot/tests/unabbrevwm.test similarity index 100% rename from src/tests/unabbrevwm.test rename to spot/tests/unabbrevwm.test diff --git a/src/tests/unambig.test b/spot/tests/unambig.test similarity index 100% rename from src/tests/unambig.test rename to spot/tests/unambig.test diff --git a/src/tests/uniq.test b/spot/tests/uniq.test similarity index 100% rename from src/tests/uniq.test rename to spot/tests/uniq.test diff --git a/src/tests/utf8.test b/spot/tests/utf8.test similarity index 100% rename from src/tests/utf8.test rename to spot/tests/utf8.test diff --git a/src/tests/uwrm.test b/spot/tests/uwrm.test similarity index 100% rename from src/tests/uwrm.test rename to spot/tests/uwrm.test diff --git a/src/tests/wdba.test b/spot/tests/wdba.test similarity index 100% rename from src/tests/wdba.test rename to spot/tests/wdba.test diff --git a/src/tests/wdba2.test b/spot/tests/wdba2.test similarity index 100% rename from src/tests/wdba2.test rename to spot/tests/wdba2.test diff --git a/src/tl/.gitignore b/spot/tl/.gitignore similarity index 100% rename from src/tl/.gitignore rename to spot/tl/.gitignore diff --git a/src/tl/Makefile.am b/spot/tl/Makefile.am similarity index 96% rename from src/tl/Makefile.am rename to spot/tl/Makefile.am index 421c65599..d4bd84089 100644 --- a/src/tl/Makefile.am +++ b/spot/tl/Makefile.am @@ -17,7 +17,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) tldir = $(pkgincludedir)/tl diff --git a/src/tl/apcollect.cc b/spot/tl/apcollect.cc similarity index 95% rename from src/tl/apcollect.cc rename to spot/tl/apcollect.cc index 0f0d3dfe7..ffc550b2e 100644 --- a/src/tl/apcollect.cc +++ b/spot/tl/apcollect.cc @@ -20,9 +20,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "apcollect.hh" -#include "twa/twa.hh" -#include "twa/bdddict.hh" +#include +#include +#include namespace spot { diff --git a/src/tl/apcollect.hh b/spot/tl/apcollect.hh similarity index 97% rename from src/tl/apcollect.hh rename to spot/tl/apcollect.hh index acde3989a..012916381 100644 --- a/src/tl/apcollect.hh +++ b/spot/tl/apcollect.hh @@ -22,10 +22,10 @@ #pragma once -#include "formula.hh" +#include #include #include -#include "twa/fwd.hh" +#include namespace spot { diff --git a/src/tl/contain.cc b/spot/tl/contain.cc similarity index 96% rename from src/tl/contain.cc rename to spot/tl/contain.cc index 47db7b420..a977edb35 100644 --- a/src/tl/contain.cc +++ b/spot/tl/contain.cc @@ -20,10 +20,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "contain.hh" -#include "simplify.hh" -#include "formula.hh" -#include "twaalgos/product.hh" +#include +#include +#include +#include namespace spot { diff --git a/src/tl/contain.hh b/spot/tl/contain.hh similarity index 96% rename from src/tl/contain.hh rename to spot/tl/contain.hh index 6c013c235..359212540 100644 --- a/src/tl/contain.hh +++ b/spot/tl/contain.hh @@ -22,9 +22,9 @@ #pragma once -#include "formula.hh" -#include "twaalgos/ltl2tgba_fm.hh" -#include "misc/hash.hh" +#include +#include +#include #include namespace spot diff --git a/src/tl/declenv.cc b/spot/tl/declenv.cc similarity index 98% rename from src/tl/declenv.cc rename to spot/tl/declenv.cc index e5ee5f9d4..b044bc522 100644 --- a/src/tl/declenv.cc +++ b/spot/tl/declenv.cc @@ -20,7 +20,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "declenv.hh" +#include namespace spot { diff --git a/src/tl/declenv.hh b/spot/tl/declenv.hh similarity index 96% rename from src/tl/declenv.hh rename to spot/tl/declenv.hh index beb094029..b1123fcdb 100644 --- a/src/tl/declenv.hh +++ b/spot/tl/declenv.hh @@ -22,10 +22,10 @@ #pragma once -#include "environment.hh" +#include #include #include -#include "formula.hh" +#include namespace spot { diff --git a/src/tl/defaultenv.cc b/spot/tl/defaultenv.cc similarity index 97% rename from src/tl/defaultenv.cc rename to spot/tl/defaultenv.cc index 6f73baee1..cbf817283 100644 --- a/src/tl/defaultenv.cc +++ b/spot/tl/defaultenv.cc @@ -20,7 +20,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "defaultenv.hh" +#include namespace spot { diff --git a/src/tl/defaultenv.hh b/spot/tl/defaultenv.hh similarity index 96% rename from src/tl/defaultenv.hh rename to spot/tl/defaultenv.hh index 2302446a4..53f120d90 100644 --- a/src/tl/defaultenv.hh +++ b/spot/tl/defaultenv.hh @@ -22,8 +22,8 @@ #pragma once -#include "environment.hh" -#include "formula.hh" +#include +#include namespace spot { diff --git a/src/tl/dot.cc b/spot/tl/dot.cc similarity index 98% rename from src/tl/dot.cc rename to spot/tl/dot.cc index e5e174bdc..ab99da93d 100644 --- a/src/tl/dot.cc +++ b/spot/tl/dot.cc @@ -20,8 +20,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "dot.hh" -#include "formula.hh" +#include +#include #include #include #include diff --git a/src/tl/dot.hh b/spot/tl/dot.hh similarity index 97% rename from src/tl/dot.hh rename to spot/tl/dot.hh index caff7b38a..1c1543432 100644 --- a/src/tl/dot.hh +++ b/spot/tl/dot.hh @@ -22,7 +22,7 @@ #pragma once -#include "formula.hh" +#include namespace spot { diff --git a/src/tl/environment.hh b/spot/tl/environment.hh similarity index 98% rename from src/tl/environment.hh rename to spot/tl/environment.hh index 5a29346a7..a44b3582b 100644 --- a/src/tl/environment.hh +++ b/spot/tl/environment.hh @@ -22,7 +22,7 @@ #pragma once -#include "formula.hh" +#include #include namespace spot diff --git a/src/tl/exclusive.cc b/spot/tl/exclusive.cc similarity index 96% rename from src/tl/exclusive.cc rename to spot/tl/exclusive.cc index de3b37b0e..5d000721f 100644 --- a/src/tl/exclusive.cc +++ b/spot/tl/exclusive.cc @@ -17,11 +17,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "exclusive.hh" -#include "twaalgos/mask.hh" -#include "misc/casts.hh" -#include "misc/minato.hh" -#include "apcollect.hh" +#include +#include +#include +#include +#include namespace spot { diff --git a/src/tl/exclusive.hh b/spot/tl/exclusive.hh similarity index 95% rename from src/tl/exclusive.hh rename to spot/tl/exclusive.hh index aef2c33b6..484fc213b 100644 --- a/src/tl/exclusive.hh +++ b/spot/tl/exclusive.hh @@ -20,8 +20,8 @@ #pragma once #include -#include "formula.hh" -#include "twa/twagraph.hh" +#include +#include namespace spot { diff --git a/src/tl/formula.cc b/spot/tl/formula.cc similarity index 99% rename from src/tl/formula.cc rename to spot/tl/formula.cc index c7b10a218..11335a27a 100644 --- a/src/tl/formula.cc +++ b/spot/tl/formula.cc @@ -18,16 +18,16 @@ // along with this program. If not, see . #include "config.h" -#include "misc/common.hh" -#include "formula.hh" +#include +#include #include #include #include #include #include #include -#include "misc/bareword.hh" -#include "print.hh" +#include +#include #ifndef HAVE_STRVERSCMP // If the libc does not have this, a version is compiled in lib/. diff --git a/src/tl/formula.hh b/spot/tl/formula.hh similarity index 99% rename from src/tl/formula.hh rename to spot/tl/formula.hh index b5242cc34..2b7e9013c 100644 --- a/src/tl/formula.hh +++ b/spot/tl/formula.hh @@ -40,7 +40,7 @@ /// \addtogroup tl_misc Miscellaneous Algorithms for Formulas /// \ingroup tl -#include "misc/common.hh" +#include #include #include #include diff --git a/src/tl/length.cc b/spot/tl/length.cc similarity index 96% rename from src/tl/length.cc rename to spot/tl/length.cc index 224f96aef..2c87a62e5 100644 --- a/src/tl/length.cc +++ b/spot/tl/length.cc @@ -20,8 +20,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "length.hh" -#include "formula.hh" +#include +#include namespace spot { diff --git a/src/tl/length.hh b/spot/tl/length.hh similarity index 98% rename from src/tl/length.hh rename to spot/tl/length.hh index 2809d1247..0ca297963 100644 --- a/src/tl/length.hh +++ b/spot/tl/length.hh @@ -22,7 +22,7 @@ #pragma once -#include "formula.hh" +#include namespace spot { diff --git a/src/tl/mark.cc b/spot/tl/mark.cc similarity index 99% rename from src/tl/mark.cc rename to spot/tl/mark.cc index 79d6ee36f..884d8cd6f 100644 --- a/src/tl/mark.cc +++ b/spot/tl/mark.cc @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "mark.hh" +#include #include #include #include diff --git a/src/tl/mark.hh b/spot/tl/mark.hh similarity index 95% rename from src/tl/mark.hh rename to spot/tl/mark.hh index 0a040e43e..26e8bc2ef 100644 --- a/src/tl/mark.hh +++ b/spot/tl/mark.hh @@ -19,8 +19,8 @@ #pragma once -#include "formula.hh" -#include "misc/hash.hh" +#include +#include namespace spot { diff --git a/src/tl/mutation.cc b/spot/tl/mutation.cc similarity index 98% rename from src/tl/mutation.cc rename to spot/tl/mutation.cc index 88b76a9c2..131cab8dc 100644 --- a/src/tl/mutation.cc +++ b/spot/tl/mutation.cc @@ -20,9 +20,9 @@ #include #include -#include "apcollect.hh" -#include "mutation.hh" -#include "length.hh" +#include +#include +#include #define And_(x, y) formula::And({(x), (y)}) #define AndRat_(x, y) formula::AndRat({(x), (y)}) diff --git a/src/tl/mutation.hh b/spot/tl/mutation.hh similarity index 97% rename from src/tl/mutation.hh rename to spot/tl/mutation.hh index 99d23cad6..aee2ef12b 100644 --- a/src/tl/mutation.hh +++ b/spot/tl/mutation.hh @@ -19,7 +19,7 @@ #pragma once -#include "formula.hh" +#include #include namespace spot diff --git a/src/tl/nenoform.cc b/spot/tl/nenoform.cc similarity index 95% rename from src/tl/nenoform.cc rename to spot/tl/nenoform.cc index 7a7433fe0..7283080c8 100644 --- a/src/tl/nenoform.cc +++ b/spot/tl/nenoform.cc @@ -20,8 +20,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "nenoform.hh" -#include "simplify.hh" +#include +#include namespace spot { diff --git a/src/tl/nenoform.hh b/spot/tl/nenoform.hh similarity index 98% rename from src/tl/nenoform.hh rename to spot/tl/nenoform.hh index 5f564fead..3522e4ca1 100644 --- a/src/tl/nenoform.hh +++ b/spot/tl/nenoform.hh @@ -22,7 +22,7 @@ #pragma once -#include "formula.hh" +#include namespace spot { diff --git a/src/tl/parse.hh b/spot/tl/parse.hh similarity index 98% rename from src/tl/parse.hh rename to spot/tl/parse.hh index 1d2eb33d4..e5029e546 100644 --- a/src/tl/parse.hh +++ b/spot/tl/parse.hh @@ -22,9 +22,9 @@ #pragma once -#include "tl/formula.hh" -#include "misc/location.hh" -#include "tl/defaultenv.hh" +#include +#include +#include #include #include #include diff --git a/src/tl/print.cc b/spot/tl/print.cc similarity index 99% rename from src/tl/print.cc rename to spot/tl/print.cc index 5743fc9fa..43196c58e 100644 --- a/src/tl/print.cc +++ b/spot/tl/print.cc @@ -25,9 +25,9 @@ #include #include #include -#include "unabbrev.hh" -#include "print.hh" -#include "misc/escape.hh" +#include +#include +#include namespace spot { diff --git a/src/tl/print.hh b/spot/tl/print.hh similarity index 99% rename from src/tl/print.hh rename to spot/tl/print.hh index 22f6bb06e..ed8a0b2b4 100644 --- a/src/tl/print.hh +++ b/spot/tl/print.hh @@ -22,7 +22,7 @@ #pragma once -#include "formula.hh" +#include #include namespace spot diff --git a/src/tl/randomltl.cc b/spot/tl/randomltl.cc similarity index 99% rename from src/tl/randomltl.cc rename to spot/tl/randomltl.cc index c531e975c..aec952a87 100644 --- a/src/tl/randomltl.cc +++ b/spot/tl/randomltl.cc @@ -22,12 +22,12 @@ #include #include -#include "randomltl.hh" -#include "misc/random.hh" +#include +#include #include #include -#include "misc/optionmap.hh" -#include "defaultenv.hh" +#include +#include #include namespace spot diff --git a/src/tl/randomltl.hh b/spot/tl/randomltl.hh similarity index 98% rename from src/tl/randomltl.hh rename to spot/tl/randomltl.hh index 86a490a9e..537c30412 100644 --- a/src/tl/randomltl.hh +++ b/spot/tl/randomltl.hh @@ -22,13 +22,13 @@ #pragma once -#include "apcollect.hh" +#include #include #include -#include "misc/optionmap.hh" -#include "misc/hash.hh" -#include "simplify.hh" +#include +#include +#include #define OUTPUTBOOL 1 #define OUTPUTLTL 2 diff --git a/src/tl/relabel.cc b/spot/tl/relabel.cc similarity index 99% rename from src/tl/relabel.cc rename to spot/tl/relabel.cc index a3a05bab3..0ace49d63 100644 --- a/src/tl/relabel.cc +++ b/spot/tl/relabel.cc @@ -17,9 +17,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "relabel.hh" +#include #include -#include "misc/hash.hh" +#include #include #include #include diff --git a/src/tl/relabel.hh b/spot/tl/relabel.hh similarity index 96% rename from src/tl/relabel.hh rename to spot/tl/relabel.hh index 6f70108da..9fb6e5270 100644 --- a/src/tl/relabel.hh +++ b/spot/tl/relabel.hh @@ -19,8 +19,8 @@ #pragma once -#include "formula.hh" -#include "misc/hash.hh" +#include +#include #include namespace spot diff --git a/src/tl/remove_x.cc b/spot/tl/remove_x.cc similarity index 96% rename from src/tl/remove_x.cc rename to spot/tl/remove_x.cc index 5e662fdb3..77816808c 100644 --- a/src/tl/remove_x.cc +++ b/spot/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 . -#include "simplify.hh" -#include "apcollect.hh" -#include "remove_x.hh" +#include +#include +#include namespace spot { diff --git a/src/tl/remove_x.hh b/spot/tl/remove_x.hh similarity index 98% rename from src/tl/remove_x.hh rename to spot/tl/remove_x.hh index aa8403387..0a3961607 100644 --- a/src/tl/remove_x.hh +++ b/spot/tl/remove_x.hh @@ -19,7 +19,7 @@ #pragma once -#include "formula.hh" +#include namespace spot { diff --git a/src/tl/simplify.cc b/spot/tl/simplify.cc similarity index 99% rename from src/tl/simplify.cc rename to spot/tl/simplify.cc index 61754b9eb..1605647fb 100644 --- a/src/tl/simplify.cc +++ b/spot/tl/simplify.cc @@ -25,12 +25,12 @@ #define trace while (0) std::cerr #endif -#include "simplify.hh" +#include #include -#include "contain.hh" -#include "print.hh" -#include "snf.hh" -#include "twa/formula2bdd.hh" +#include +#include +#include +#include #include #include diff --git a/src/tl/simplify.hh b/spot/tl/simplify.hh similarity index 99% rename from src/tl/simplify.hh rename to spot/tl/simplify.hh index a3506fc9f..bc4c104e5 100644 --- a/src/tl/simplify.hh +++ b/spot/tl/simplify.hh @@ -19,9 +19,9 @@ #pragma once -#include "formula.hh" +#include #include -#include "twa/bdddict.hh" +#include #include namespace spot diff --git a/src/tl/snf.cc b/spot/tl/snf.cc similarity index 99% rename from src/tl/snf.cc rename to spot/tl/snf.cc index 48392b772..2f2e651ef 100644 --- a/src/tl/snf.cc +++ b/spot/tl/snf.cc @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "snf.hh" +#include namespace spot { diff --git a/src/tl/snf.hh b/spot/tl/snf.hh similarity index 98% rename from src/tl/snf.hh rename to spot/tl/snf.hh index ee6548f35..d5aee80f6 100644 --- a/src/tl/snf.hh +++ b/spot/tl/snf.hh @@ -19,7 +19,7 @@ #pragma once -#include "formula.hh" +#include #include namespace spot diff --git a/src/tl/unabbrev.cc b/spot/tl/unabbrev.cc similarity index 99% rename from src/tl/unabbrev.cc rename to spot/tl/unabbrev.cc index d0bf6cd91..416d0cac6 100644 --- a/src/tl/unabbrev.cc +++ b/spot/tl/unabbrev.cc @@ -18,7 +18,7 @@ // along with this program. If not, see . -#include "unabbrev.hh" +#include namespace spot { diff --git a/src/tl/unabbrev.hh b/spot/tl/unabbrev.hh similarity index 98% rename from src/tl/unabbrev.hh rename to spot/tl/unabbrev.hh index f1fc34107..2e7129633 100644 --- a/src/tl/unabbrev.hh +++ b/spot/tl/unabbrev.hh @@ -19,7 +19,7 @@ #pragma once -#include "formula.hh" +#include #include namespace spot diff --git a/src/twa/.gitignore b/spot/twa/.gitignore similarity index 100% rename from src/twa/.gitignore rename to spot/twa/.gitignore diff --git a/src/twa/Makefile.am b/spot/twa/Makefile.am similarity index 95% rename from src/twa/Makefile.am rename to spot/twa/Makefile.am index 936da7d32..623797508 100644 --- a/src/twa/Makefile.am +++ b/spot/twa/Makefile.am @@ -20,7 +20,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) twadir = $(pkgincludedir)/twa diff --git a/src/twa/acc.cc b/spot/twa/acc.cc similarity index 99% rename from src/twa/acc.cc rename to spot/twa/acc.cc index 5a3bc8450..1d5211311 100644 --- a/src/twa/acc.cc +++ b/spot/twa/acc.cc @@ -24,10 +24,10 @@ #include #include #include -#include "acc.hh" -#include "priv/bddalloc.hh" -#include "misc/minato.hh" -#include "misc/random.hh" +#include +#include "spot/priv/bddalloc.hh" +#include +#include namespace spot { diff --git a/src/twa/acc.hh b/spot/twa/acc.hh similarity index 99% rename from src/twa/acc.hh rename to spot/twa/acc.hh index 1bd8b65f9..059462180 100644 --- a/src/twa/acc.hh +++ b/spot/twa/acc.hh @@ -23,7 +23,7 @@ #include #include #include -#include "tl/defaultenv.hh" +#include #include namespace spot diff --git a/src/twa/bdddict.cc b/spot/twa/bdddict.cc similarity index 98% rename from src/twa/bdddict.cc rename to spot/twa/bdddict.cc index 6cc9e63ae..f5c0b121a 100644 --- a/src/twa/bdddict.cc +++ b/spot/twa/bdddict.cc @@ -23,11 +23,11 @@ #include #include #include -#include "tl/print.hh" -#include "tl/formula.hh" -#include "tl/defaultenv.hh" -#include "priv/bddalloc.hh" -#include "bdddict.hh" +#include +#include +#include +#include "spot/priv/bddalloc.hh" +#include namespace spot { diff --git a/src/twa/bdddict.hh b/spot/twa/bdddict.hh similarity index 99% rename from src/twa/bdddict.hh rename to spot/twa/bdddict.hh index 312d20ab0..0bb364f72 100644 --- a/src/twa/bdddict.hh +++ b/spot/twa/bdddict.hh @@ -29,7 +29,7 @@ #include #include #include -#include "tl/formula.hh" +#include namespace spot { diff --git a/src/twa/bddprint.cc b/spot/twa/bddprint.cc similarity index 97% rename from src/twa/bddprint.cc rename to spot/twa/bddprint.cc index b5e4ea7b9..ffccb39f0 100644 --- a/src/twa/bddprint.cc +++ b/spot/twa/bddprint.cc @@ -23,10 +23,10 @@ #include #include #include -#include "bddprint.hh" -#include "tl/print.hh" -#include "formula2bdd.hh" -#include "misc/minato.hh" +#include +#include +#include +#include namespace spot { diff --git a/src/twa/bddprint.hh b/spot/twa/bddprint.hh similarity index 99% rename from src/twa/bddprint.hh rename to spot/twa/bddprint.hh index 69231db11..e748079ba 100644 --- a/src/twa/bddprint.hh +++ b/spot/twa/bddprint.hh @@ -24,7 +24,7 @@ #include #include -#include "bdddict.hh" +#include #include namespace spot diff --git a/src/twa/formula2bdd.cc b/spot/twa/formula2bdd.cc similarity index 98% rename from src/twa/formula2bdd.cc rename to spot/twa/formula2bdd.cc index 19c221e17..134b648ad 100644 --- a/src/twa/formula2bdd.cc +++ b/spot/twa/formula2bdd.cc @@ -21,8 +21,8 @@ // along with this program. If not, see . #include -#include "formula2bdd.hh" -#include "misc/minato.hh" +#include +#include namespace spot { diff --git a/src/twa/formula2bdd.hh b/spot/twa/formula2bdd.hh similarity index 98% rename from src/twa/formula2bdd.hh rename to spot/twa/formula2bdd.hh index 90f276500..56ce4c8f2 100644 --- a/src/twa/formula2bdd.hh +++ b/spot/twa/formula2bdd.hh @@ -22,7 +22,7 @@ #pragma once -#include "bdddict.hh" +#include namespace spot { diff --git a/src/twa/fwd.hh b/spot/twa/fwd.hh similarity index 100% rename from src/twa/fwd.hh rename to spot/twa/fwd.hh diff --git a/src/twa/taatgba.cc b/spot/twa/taatgba.cc similarity index 98% rename from src/twa/taatgba.cc rename to spot/twa/taatgba.cc index c60f2f454..a133d753a 100644 --- a/src/twa/taatgba.cc +++ b/spot/twa/taatgba.cc @@ -21,9 +21,9 @@ #include #include #include -#include "twa/formula2bdd.hh" -#include "tl/print.hh" -#include "taatgba.hh" +#include +#include +#include namespace spot { diff --git a/src/twa/taatgba.hh b/spot/twa/taatgba.hh similarity index 98% rename from src/twa/taatgba.hh rename to spot/twa/taatgba.hh index 6d69a65ba..f31408021 100644 --- a/src/twa/taatgba.hh +++ b/spot/twa/taatgba.hh @@ -23,10 +23,10 @@ #include #include #include -#include "misc/hash.hh" -#include "tl/formula.hh" -#include "bdddict.hh" -#include "twa.hh" +#include +#include +#include +#include namespace spot { diff --git a/src/twa/twa.cc b/spot/twa/twa.cc similarity index 95% rename from src/twa/twa.cc rename to spot/twa/twa.cc index 7586f4fdf..06719297a 100644 --- a/src/twa/twa.cc +++ b/spot/twa/twa.cc @@ -20,10 +20,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "twa.hh" -#include "twagraph.hh" -#include "twaalgos/gtec/gtec.hh" -#include "twaalgos/remfin.hh" +#include +#include +#include +#include #include namespace spot diff --git a/src/twa/twa.hh b/spot/twa/twa.hh similarity index 99% rename from src/twa/twa.hh rename to spot/twa/twa.hh index 87f2165bc..596c7b05b 100644 --- a/src/twa/twa.hh +++ b/spot/twa/twa.hh @@ -22,18 +22,18 @@ #pragma once -#include "fwd.hh" -#include "acc.hh" -#include "bdddict.hh" +#include +#include +#include #include #include #include #include #include #include -#include "misc/casts.hh" -#include "misc/hash.hh" -#include "tl/formula.hh" +#include +#include +#include namespace spot { diff --git a/src/twa/twagraph.cc b/spot/twa/twagraph.cc similarity index 99% rename from src/twa/twagraph.cc rename to spot/twa/twagraph.cc index 5c03d71e7..cf080589e 100644 --- a/src/twa/twagraph.cc +++ b/spot/twa/twagraph.cc @@ -17,8 +17,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "twagraph.hh" -#include "tl/print.hh" +#include +#include namespace spot { diff --git a/src/twa/twagraph.hh b/spot/twa/twagraph.hh similarity index 98% rename from src/twa/twagraph.hh rename to spot/twa/twagraph.hh index 3ce5129ef..cd21a62b4 100644 --- a/src/twa/twagraph.hh +++ b/spot/twa/twagraph.hh @@ -19,13 +19,13 @@ #pragma once -#include "fwd.hh" -#include "graph/graph.hh" -#include "graph/ngraph.hh" -#include "twa/bdddict.hh" -#include "twa/twa.hh" -#include "twaalgos/copy.hh" -#include "tl/formula.hh" +#include +#include +#include +#include +#include +#include +#include #include namespace spot diff --git a/src/twa/twaproduct.cc b/spot/twa/twaproduct.cc similarity index 99% rename from src/twa/twaproduct.cc rename to spot/twa/twaproduct.cc index b9ba03b4e..19853fa9f 100644 --- a/src/twa/twaproduct.cc +++ b/spot/twa/twaproduct.cc @@ -20,11 +20,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "twaproduct.hh" +#include #include #include -#include "misc/hashfunc.hh" -#include "kripke/kripke.hh" +#include +#include namespace spot { diff --git a/src/twa/twaproduct.hh b/spot/twa/twaproduct.hh similarity index 98% rename from src/twa/twaproduct.hh rename to spot/twa/twaproduct.hh index 1e0316eea..52591278d 100644 --- a/src/twa/twaproduct.hh +++ b/spot/twa/twaproduct.hh @@ -22,8 +22,8 @@ #pragma once -#include "twa.hh" -#include "misc/fixpool.hh" +#include +#include namespace spot { diff --git a/src/twa/twasafracomplement.cc b/spot/twa/twasafracomplement.cc similarity index 99% rename from src/twa/twasafracomplement.cc rename to spot/twa/twasafracomplement.cc index 43af5c2d4..91d2420ce 100644 --- a/src/twa/twasafracomplement.cc +++ b/spot/twa/twasafracomplement.cc @@ -23,17 +23,17 @@ #include #include #include -#include "misc/bitvect.hh" +#include #include -#include "misc/hash.hh" -#include "misc/bddlt.hh" -#include "twa/bdddict.hh" -#include "twa/twa.hh" -#include "misc/hashfunc.hh" -#include "tl/formula.hh" -#include "twaalgos/dot.hh" -#include "twa/twasafracomplement.hh" -#include "twaalgos/degen.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/src/twa/twasafracomplement.hh b/spot/twa/twasafracomplement.hh similarity index 99% rename from src/twa/twasafracomplement.hh rename to spot/twa/twasafracomplement.hh index 857b1e743..9016e68e5 100644 --- a/src/twa/twasafracomplement.hh +++ b/spot/twa/twasafracomplement.hh @@ -20,7 +20,7 @@ #pragma once #include -#include "twa.hh" +#include #ifndef TRANSFORM_TO_TBA # define TRANSFORM_TO_TBA 0 diff --git a/src/twaalgos/.gitignore b/spot/twaalgos/.gitignore similarity index 100% rename from src/twaalgos/.gitignore rename to spot/twaalgos/.gitignore diff --git a/src/twaalgos/Makefile.am b/spot/twaalgos/Makefile.am similarity index 97% rename from src/twaalgos/Makefile.am rename to spot/twaalgos/Makefile.am index 7f63b4a02..a44976d21 100644 --- a/src/twaalgos/Makefile.am +++ b/spot/twaalgos/Makefile.am @@ -22,7 +22,7 @@ SUBDIRS = gtec -AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) twaalgosdir = $(pkgincludedir)/twaalgos diff --git a/src/twaalgos/are_isomorphic.cc b/spot/twaalgos/are_isomorphic.cc similarity index 96% rename from src/twaalgos/are_isomorphic.cc rename to spot/twaalgos/are_isomorphic.cc index 57991a440..a53106fa0 100644 --- a/src/twaalgos/are_isomorphic.cc +++ b/spot/twaalgos/are_isomorphic.cc @@ -20,10 +20,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "twa/twagraph.hh" -#include "twaalgos/are_isomorphic.hh" -#include "twaalgos/canonicalize.hh" -#include "twaalgos/isdet.hh" +#include +#include +#include +#include #include #include diff --git a/src/twaalgos/are_isomorphic.hh b/spot/twaalgos/are_isomorphic.hh similarity index 98% rename from src/twaalgos/are_isomorphic.hh rename to spot/twaalgos/are_isomorphic.hh index f0da226f1..f9f25eb7a 100644 --- a/src/twaalgos/are_isomorphic.hh +++ b/spot/twaalgos/are_isomorphic.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include #include namespace spot diff --git a/src/twaalgos/bfssteps.cc b/spot/twaalgos/bfssteps.cc similarity index 97% rename from src/twaalgos/bfssteps.cc rename to spot/twaalgos/bfssteps.cc index 81e5133b2..b37604dee 100644 --- a/src/twaalgos/bfssteps.cc +++ b/spot/twaalgos/bfssteps.cc @@ -22,8 +22,8 @@ #include #include -#include "twa/twa.hh" -#include "bfssteps.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/bfssteps.hh b/spot/twaalgos/bfssteps.hh similarity index 99% rename from src/twaalgos/bfssteps.hh rename to spot/twaalgos/bfssteps.hh index 66a31e19d..3400bd404 100644 --- a/src/twaalgos/bfssteps.hh +++ b/spot/twaalgos/bfssteps.hh @@ -23,7 +23,7 @@ #pragma once #include -#include "emptiness.hh" +#include namespace spot { diff --git a/src/twaalgos/canonicalize.cc b/spot/twaalgos/canonicalize.cc similarity index 97% rename from src/twaalgos/canonicalize.cc rename to spot/twaalgos/canonicalize.cc index 4d9041cef..888b71daf 100644 --- a/src/twaalgos/canonicalize.cc +++ b/spot/twaalgos/canonicalize.cc @@ -17,8 +17,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "canonicalize.hh" -#include "twa/twagraph.hh" +#include +#include #include #include diff --git a/src/twaalgos/canonicalize.hh b/spot/twaalgos/canonicalize.hh similarity index 97% rename from src/twaalgos/canonicalize.hh rename to spot/twaalgos/canonicalize.hh index e240174e1..f302fe4d7 100644 --- a/src/twaalgos/canonicalize.hh +++ b/spot/twaalgos/canonicalize.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/cleanacc.cc b/spot/twaalgos/cleanacc.cc similarity index 98% rename from src/twaalgos/cleanacc.cc rename to spot/twaalgos/cleanacc.cc index 8ffde1915..64d8e91cb 100644 --- a/src/twaalgos/cleanacc.cc +++ b/spot/twaalgos/cleanacc.cc @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "twaalgos/cleanacc.hh" +#include namespace spot { diff --git a/src/twaalgos/cleanacc.hh b/spot/twaalgos/cleanacc.hh similarity index 97% rename from src/twaalgos/cleanacc.hh rename to spot/twaalgos/cleanacc.hh index 04178cc63..af38c34fb 100644 --- a/src/twaalgos/cleanacc.hh +++ b/spot/twaalgos/cleanacc.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/complement.cc b/spot/twaalgos/complement.cc similarity index 88% rename from src/twaalgos/complement.cc rename to spot/twaalgos/complement.cc index 446bd5f87..03f9c24c4 100644 --- a/src/twaalgos/complement.cc +++ b/spot/twaalgos/complement.cc @@ -17,10 +17,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "complement.hh" -#include "sccinfo.hh" -#include "complete.hh" -#include "cleanacc.hh" +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/complement.hh b/spot/twaalgos/complement.hh similarity index 97% rename from src/twaalgos/complement.hh rename to spot/twaalgos/complement.hh index b1f2b391d..1508919ba 100644 --- a/src/twaalgos/complement.hh +++ b/spot/twaalgos/complement.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/complete.cc b/spot/twaalgos/complete.cc similarity index 99% rename from src/twaalgos/complete.cc rename to spot/twaalgos/complete.cc index 37b71f193..07fb1751f 100644 --- a/src/twaalgos/complete.cc +++ b/spot/twaalgos/complete.cc @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "complete.hh" +#include namespace spot { diff --git a/src/twaalgos/complete.hh b/spot/twaalgos/complete.hh similarity index 97% rename from src/twaalgos/complete.hh rename to spot/twaalgos/complete.hh index d03e0a8da..10c50a862 100644 --- a/src/twaalgos/complete.hh +++ b/spot/twaalgos/complete.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/compsusp.cc b/spot/twaalgos/compsusp.cc similarity index 96% rename from src/twaalgos/compsusp.cc rename to spot/twaalgos/compsusp.cc index b2e460276..f530fbf35 100644 --- a/src/twaalgos/compsusp.cc +++ b/spot/twaalgos/compsusp.cc @@ -17,18 +17,18 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "compsusp.hh" -#include "sccfilter.hh" -#include "sccinfo.hh" -#include "twa/twagraph.hh" -#include "ltl2tgba_fm.hh" -#include "minimize.hh" -#include "simulation.hh" -#include "strength.hh" -#include "tl/print.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include "tl/environment.hh" +#include namespace spot { diff --git a/src/twaalgos/compsusp.hh b/spot/twaalgos/compsusp.hh similarity index 97% rename from src/twaalgos/compsusp.hh rename to spot/twaalgos/compsusp.hh index 2bc690e8d..ae7cf7aec 100644 --- a/src/twaalgos/compsusp.hh +++ b/spot/twaalgos/compsusp.hh @@ -19,8 +19,8 @@ #pragma once -#include "tl/formula.hh" -#include "twa/twagraph.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/copy.cc b/spot/twaalgos/copy.cc similarity index 94% rename from src/twaalgos/copy.cc rename to spot/twaalgos/copy.cc index 229eec681..3ae73af12 100644 --- a/src/twaalgos/copy.cc +++ b/spot/twaalgos/copy.cc @@ -20,13 +20,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "copy.hh" -#include "twa/twagraph.hh" +#include +#include #include #include #include -#include "reachiter.hh" -#include "dot.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/copy.hh b/spot/twaalgos/copy.hh similarity index 93% rename from src/twaalgos/copy.hh rename to spot/twaalgos/copy.hh index 16f8ada22..ae453f38d 100644 --- a/src/twaalgos/copy.hh +++ b/spot/twaalgos/copy.hh @@ -22,9 +22,9 @@ #pragma once -#include "misc/common.hh" -#include "twa/fwd.hh" -#include "twa/twa.hh" +#include +#include +#include #include namespace spot diff --git a/src/twaalgos/cycles.cc b/spot/twaalgos/cycles.cc similarity index 98% rename from src/twaalgos/cycles.cc rename to spot/twaalgos/cycles.cc index e7b2c0c16..d6c980cb0 100644 --- a/src/twaalgos/cycles.cc +++ b/spot/twaalgos/cycles.cc @@ -18,7 +18,7 @@ // along with this program. If not, see . #include -#include "cycles.hh" +#include namespace spot { diff --git a/src/twaalgos/cycles.hh b/spot/twaalgos/cycles.hh similarity index 98% rename from src/twaalgos/cycles.hh rename to spot/twaalgos/cycles.hh index fc18482cb..1b1ee7eb4 100644 --- a/src/twaalgos/cycles.hh +++ b/spot/twaalgos/cycles.hh @@ -19,8 +19,8 @@ #pragma once -#include "sccinfo.hh" -#include "misc/hash.hh" +#include +#include #include namespace spot diff --git a/src/twaalgos/degen.cc b/spot/twaalgos/degen.cc similarity index 98% rename from src/twaalgos/degen.cc rename to spot/twaalgos/degen.cc index c8f807b7f..522824f84 100644 --- a/src/twaalgos/degen.cc +++ b/spot/twaalgos/degen.cc @@ -18,16 +18,16 @@ // along with this program. If not, see . -#include "degen.hh" -#include "twa/twagraph.hh" -#include "misc/hash.hh" -#include "misc/hashfunc.hh" +#include +#include +#include +#include #include #include #include #include -#include "twaalgos/sccinfo.hh" -#include "twa/bddprint.hh" +#include +#include //#define DEGEN_DEBUG diff --git a/src/twaalgos/degen.hh b/spot/twaalgos/degen.hh similarity index 98% rename from src/twaalgos/degen.hh rename to spot/twaalgos/degen.hh index ff4014581..1c161bc96 100644 --- a/src/twaalgos/degen.hh +++ b/spot/twaalgos/degen.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/dot.cc b/spot/twaalgos/dot.cc similarity index 97% rename from src/twaalgos/dot.cc rename to spot/twaalgos/dot.cc index 0910a120a..8eda7698d 100644 --- a/src/twaalgos/dot.cc +++ b/spot/twaalgos/dot.cc @@ -22,15 +22,15 @@ #include #include -#include "twa/twagraph.hh" -#include "dot.hh" -#include "twa/bddprint.hh" -#include "reachiter.hh" -#include "misc/escape.hh" -#include "twa/twagraph.hh" -#include "twa/formula2bdd.hh" -#include "twaalgos/copy.hh" -#include "twaalgos/sccinfo.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/twaalgos/dot.hh b/spot/twaalgos/dot.hh similarity index 96% rename from src/twaalgos/dot.hh rename to spot/twaalgos/dot.hh index df128ff0d..0a64ca483 100644 --- a/src/twaalgos/dot.hh +++ b/spot/twaalgos/dot.hh @@ -23,8 +23,8 @@ #pragma once #include -#include -#include "misc/common.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/dtbasat.cc b/spot/twaalgos/dtbasat.cc similarity index 98% rename from src/twaalgos/dtbasat.cc rename to spot/twaalgos/dtbasat.cc index 478a19cb3..0841f1f8f 100644 --- a/src/twaalgos/dtbasat.cc +++ b/spot/twaalgos/dtbasat.cc @@ -20,16 +20,16 @@ #include #include #include -#include "dtbasat.hh" -#include "reachiter.hh" +#include +#include #include #include -#include "sccinfo.hh" -#include "twa/bddprint.hh" -#include "stats.hh" -#include "misc/satsolver.hh" -#include "misc/timer.hh" -#include "dot.hh" +#include +#include +#include +#include +#include +#include // If you set the SPOT_TMPKEEP environment variable the temporary // file used to communicate with the sat solver will be left in diff --git a/src/twaalgos/dtbasat.hh b/spot/twaalgos/dtbasat.hh similarity index 98% rename from src/twaalgos/dtbasat.hh rename to spot/twaalgos/dtbasat.hh index f5712f00e..edec78333 100644 --- a/src/twaalgos/dtbasat.hh +++ b/spot/twaalgos/dtbasat.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/dtwasat.cc b/spot/twaalgos/dtwasat.cc similarity index 98% rename from src/twaalgos/dtwasat.cc rename to spot/twaalgos/dtwasat.cc index 97b670b06..e898a9699 100644 --- a/src/twaalgos/dtwasat.cc +++ b/spot/twaalgos/dtwasat.cc @@ -20,24 +20,24 @@ #include #include #include -#include "dtwasat.hh" -#include "dtbasat.hh" +#include +#include #include #include -#include "sccinfo.hh" -#include "twa/bddprint.hh" -#include "stats.hh" -#include "tl/defaultenv.hh" -#include "misc/satsolver.hh" -#include "misc/timer.hh" -#include "isweakscc.hh" -#include "isdet.hh" -#include "dot.hh" -#include "complete.hh" -#include "misc/optionmap.hh" -#include "sccfilter.hh" -#include "sbacc.hh" -#include "postproc.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // If you set the SPOT_TMPKEEP environment variable the temporary // file used to communicate with the sat solver will be left in diff --git a/src/twaalgos/dtwasat.hh b/spot/twaalgos/dtwasat.hh similarity index 99% rename from src/twaalgos/dtwasat.hh rename to spot/twaalgos/dtwasat.hh index 61706f00b..8086a6980 100644 --- a/src/twaalgos/dtwasat.hh +++ b/spot/twaalgos/dtwasat.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/emptiness.cc b/spot/twaalgos/emptiness.cc similarity index 98% rename from src/twaalgos/emptiness.cc rename to spot/twaalgos/emptiness.cc index 73c66a432..7fe7fc72a 100644 --- a/src/twaalgos/emptiness.cc +++ b/spot/twaalgos/emptiness.cc @@ -21,16 +21,16 @@ // along with this program. If not, see . #include -#include "emptiness.hh" -#include "bfssteps.hh" -#include "gtec/gtec.hh" -#include "gv04.hh" -#include "magic.hh" -#include "misc/hash.hh" -#include "se05.hh" -#include "tau03.hh" -#include "tau03opt.hh" -#include "twa/bddprint.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/emptiness.hh b/spot/twaalgos/emptiness.hh similarity index 99% rename from src/twaalgos/emptiness.hh rename to spot/twaalgos/emptiness.hh index ac29a8574..6c4e14d7e 100644 --- a/src/twaalgos/emptiness.hh +++ b/spot/twaalgos/emptiness.hh @@ -26,9 +26,9 @@ #include #include #include -#include "misc/optionmap.hh" -#include "twa/twagraph.hh" -#include "emptiness_stats.hh" +#include +#include +#include namespace spot { diff --git a/src/twaalgos/emptiness_stats.hh b/spot/twaalgos/emptiness_stats.hh similarity index 99% rename from src/twaalgos/emptiness_stats.hh rename to spot/twaalgos/emptiness_stats.hh index 845a3a984..b34624414 100644 --- a/src/twaalgos/emptiness_stats.hh +++ b/spot/twaalgos/emptiness_stats.hh @@ -24,7 +24,7 @@ #include #include -#include "misc/ltstr.hh" +#include namespace spot { diff --git a/src/twaalgos/gtec/.gitignore b/spot/twaalgos/gtec/.gitignore similarity index 100% rename from src/twaalgos/gtec/.gitignore rename to spot/twaalgos/gtec/.gitignore diff --git a/src/twaalgos/gtec/Makefile.am b/spot/twaalgos/gtec/Makefile.am similarity index 94% rename from src/twaalgos/gtec/Makefile.am rename to spot/twaalgos/gtec/Makefile.am index 7daa01b58..59f385718 100644 --- a/src/twaalgos/gtec/Makefile.am +++ b/spot/twaalgos/gtec/Makefile.am @@ -20,7 +20,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -AM_CPPFLAGS = -I$(srcdir)/../.. -I../.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) gtecdir = $(pkgincludedir)/tgbaalgos/gtec diff --git a/src/twaalgos/gtec/ce.cc b/spot/twaalgos/gtec/ce.cc similarity index 98% rename from src/twaalgos/gtec/ce.cc rename to spot/twaalgos/gtec/ce.cc index dff850ffb..3beb69c49 100644 --- a/src/twaalgos/gtec/ce.cc +++ b/spot/twaalgos/gtec/ce.cc @@ -20,9 +20,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "ce.hh" -#include "twaalgos/bfssteps.hh" -#include "misc/hash.hh" +#include +#include +#include namespace spot { diff --git a/src/twaalgos/gtec/ce.hh b/spot/twaalgos/gtec/ce.hh similarity index 93% rename from src/twaalgos/gtec/ce.hh rename to spot/twaalgos/gtec/ce.hh index 8b3fadf3c..4de35904a 100644 --- a/src/twaalgos/gtec/ce.hh +++ b/spot/twaalgos/gtec/ce.hh @@ -22,9 +22,9 @@ #pragma once -#include "status.hh" -#include "twaalgos/emptiness.hh" -#include "twaalgos/emptiness_stats.hh" +#include +#include +#include namespace spot { diff --git a/src/twaalgos/gtec/gtec.cc b/spot/twaalgos/gtec/gtec.cc similarity index 99% rename from src/twaalgos/gtec/gtec.cc rename to spot/twaalgos/gtec/gtec.cc index 0537a9d5b..40c985921 100644 --- a/src/twaalgos/gtec/gtec.cc +++ b/spot/twaalgos/gtec/gtec.cc @@ -29,9 +29,9 @@ #define trace while (0) std::cerr #endif -#include "gtec.hh" -#include "ce.hh" -#include "misc/memusage.hh" +#include +#include +#include namespace spot { diff --git a/src/twaalgos/gtec/gtec.hh b/spot/twaalgos/gtec/gtec.hh similarity index 98% rename from src/twaalgos/gtec/gtec.hh rename to spot/twaalgos/gtec/gtec.hh index dfe041c0f..4d834d30a 100644 --- a/src/twaalgos/gtec/gtec.hh +++ b/spot/twaalgos/gtec/gtec.hh @@ -23,9 +23,9 @@ #pragma once #include -#include "status.hh" -#include "twaalgos/emptiness.hh" -#include "twaalgos/emptiness_stats.hh" +#include +#include +#include namespace spot { diff --git a/src/twaalgos/gtec/sccstack.cc b/spot/twaalgos/gtec/sccstack.cc similarity index 97% rename from src/twaalgos/gtec/sccstack.cc rename to spot/twaalgos/gtec/sccstack.cc index 23bd4638e..809289a09 100644 --- a/src/twaalgos/gtec/sccstack.cc +++ b/spot/twaalgos/gtec/sccstack.cc @@ -20,7 +20,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sccstack.hh" +#include namespace spot { diff --git a/src/twaalgos/gtec/sccstack.hh b/spot/twaalgos/gtec/sccstack.hh similarity index 98% rename from src/twaalgos/gtec/sccstack.hh rename to spot/twaalgos/gtec/sccstack.hh index c6c8e03b7..7285cafab 100644 --- a/src/twaalgos/gtec/sccstack.hh +++ b/spot/twaalgos/gtec/sccstack.hh @@ -24,7 +24,7 @@ #include #include -#include "twa/twa.hh" +#include namespace spot { diff --git a/src/twaalgos/gtec/status.cc b/spot/twaalgos/gtec/status.cc similarity index 97% rename from src/twaalgos/gtec/status.cc rename to spot/twaalgos/gtec/status.cc index 380222bc7..8dc6c3c16 100644 --- a/src/twaalgos/gtec/status.cc +++ b/spot/twaalgos/gtec/status.cc @@ -21,7 +21,7 @@ // along with this program. If not, see . #include -#include "status.hh" +#include namespace spot { diff --git a/src/twaalgos/gtec/status.hh b/spot/twaalgos/gtec/status.hh similarity index 96% rename from src/twaalgos/gtec/status.hh rename to spot/twaalgos/gtec/status.hh index d7db86a78..f6e38b92e 100644 --- a/src/twaalgos/gtec/status.hh +++ b/spot/twaalgos/gtec/status.hh @@ -22,8 +22,8 @@ #pragma once -#include "sccstack.hh" -#include "twa/twa.hh" +#include +#include #include namespace spot diff --git a/src/twaalgos/gv04.cc b/spot/twaalgos/gv04.cc similarity index 97% rename from src/twaalgos/gv04.cc rename to spot/twaalgos/gv04.cc index 14f299897..c4d8f631a 100644 --- a/src/twaalgos/gv04.cc +++ b/spot/twaalgos/gv04.cc @@ -32,12 +32,12 @@ #include #include #include -#include "twa/twa.hh" -#include "misc/hash.hh" -#include "emptiness.hh" -#include "emptiness_stats.hh" -#include "gv04.hh" -#include "bfssteps.hh" +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/gv04.hh b/spot/twaalgos/gv04.hh similarity index 95% rename from src/twaalgos/gv04.hh rename to spot/twaalgos/gv04.hh index 73c423070..3dea3b920 100644 --- a/src/twaalgos/gv04.hh +++ b/spot/twaalgos/gv04.hh @@ -22,9 +22,9 @@ #pragma once -#include "misc/optionmap.hh" -#include "twa/fwd.hh" -#include "emptiness.hh" +#include +#include +#include namespace spot { diff --git a/src/twaalgos/hoa.cc b/spot/twaalgos/hoa.cc similarity index 98% rename from src/twaalgos/hoa.cc rename to spot/twaalgos/hoa.cc index f5340dde8..0d88e46ff 100644 --- a/src/twaalgos/hoa.cc +++ b/spot/twaalgos/hoa.cc @@ -24,15 +24,15 @@ #include #include #include -#include "twa/twa.hh" -#include "twa/twagraph.hh" -#include "hoa.hh" -#include "reachiter.hh" -#include "misc/escape.hh" -#include "misc/bddlt.hh" -#include "misc/minato.hh" -#include "twa/formula2bdd.hh" -#include "tl/formula.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/hoa.hh b/spot/twaalgos/hoa.hh similarity index 96% rename from src/twaalgos/hoa.hh rename to spot/twaalgos/hoa.hh index 1f32d2b2f..a2222aa82 100644 --- a/src/twaalgos/hoa.hh +++ b/spot/twaalgos/hoa.hh @@ -20,8 +20,8 @@ #pragma once #include -#include "misc/common.hh" -#include "twa/fwd.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/isdet.cc b/spot/twaalgos/isdet.cc similarity index 98% rename from src/twaalgos/isdet.cc rename to spot/twaalgos/isdet.cc index 7f618fa5f..79bb27410 100644 --- a/src/twaalgos/isdet.cc +++ b/spot/twaalgos/isdet.cc @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "twaalgos/isdet.hh" +#include #include #include diff --git a/src/twaalgos/isdet.hh b/spot/twaalgos/isdet.hh similarity index 98% rename from src/twaalgos/isdet.hh rename to spot/twaalgos/isdet.hh index 377ec768d..4ddda5efc 100644 --- a/src/twaalgos/isdet.hh +++ b/spot/twaalgos/isdet.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/isunamb.cc b/spot/twaalgos/isunamb.cc similarity index 92% rename from src/twaalgos/isunamb.cc rename to spot/twaalgos/isunamb.cc index c85bb6efe..800a42ee1 100644 --- a/src/twaalgos/isunamb.cc +++ b/spot/twaalgos/isunamb.cc @@ -17,9 +17,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "isunamb.hh" -#include "twaalgos/product.hh" -#include "sccfilter.hh" +#include +#include +#include #include #include diff --git a/src/twaalgos/isunamb.hh b/spot/twaalgos/isunamb.hh similarity index 97% rename from src/twaalgos/isunamb.hh rename to spot/twaalgos/isunamb.hh index 1fca6fb8f..da243ddc0 100644 --- a/src/twaalgos/isunamb.hh +++ b/spot/twaalgos/isunamb.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/isweakscc.cc b/spot/twaalgos/isweakscc.cc similarity index 96% rename from src/twaalgos/isweakscc.cc rename to spot/twaalgos/isweakscc.cc index b1d960432..5833c7266 100644 --- a/src/twaalgos/isweakscc.cc +++ b/spot/twaalgos/isweakscc.cc @@ -17,9 +17,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "cycles.hh" -#include "tl/formula.hh" -#include "isweakscc.hh" +#include +#include +#include namespace spot { diff --git a/src/twaalgos/isweakscc.hh b/spot/twaalgos/isweakscc.hh similarity index 98% rename from src/twaalgos/isweakscc.hh rename to spot/twaalgos/isweakscc.hh index 8102039ea..ba019c651 100644 --- a/src/twaalgos/isweakscc.hh +++ b/spot/twaalgos/isweakscc.hh @@ -19,7 +19,7 @@ #pragma once -#include "sccinfo.hh" +#include namespace spot { diff --git a/src/twaalgos/lbtt.cc b/spot/twaalgos/lbtt.cc similarity index 95% rename from src/twaalgos/lbtt.cc rename to spot/twaalgos/lbtt.cc index cb628a3f9..21163c09c 100644 --- a/src/twaalgos/lbtt.cc +++ b/spot/twaalgos/lbtt.cc @@ -20,15 +20,15 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "lbtt.hh" +#include #include #include #include -#include "twa/formula2bdd.hh" -#include "reachiter.hh" -#include "misc/bddlt.hh" -#include "priv/accmap.hh" -#include "tl/print.hh" +#include +#include +#include +#include "spot/priv/accmap.hh" +#include namespace spot { diff --git a/src/twaalgos/lbtt.hh b/spot/twaalgos/lbtt.hh similarity index 98% rename from src/twaalgos/lbtt.hh rename to spot/twaalgos/lbtt.hh index aae420010..5e8ada445 100644 --- a/src/twaalgos/lbtt.hh +++ b/spot/twaalgos/lbtt.hh @@ -22,7 +22,7 @@ #pragma once -#include "twa/twa.hh" +#include #include namespace spot diff --git a/src/twaalgos/ltl2taa.cc b/spot/twaalgos/ltl2taa.cc similarity index 98% rename from src/twaalgos/ltl2taa.cc rename to spot/twaalgos/ltl2taa.cc index a250129b3..dc1fe86ce 100644 --- a/src/twaalgos/ltl2taa.cc +++ b/spot/twaalgos/ltl2taa.cc @@ -19,10 +19,10 @@ #include #include -#include "tl/unabbrev.hh" -#include "tl/nenoform.hh" -#include "tl/contain.hh" -#include "ltl2taa.hh" +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/ltl2taa.hh b/spot/twaalgos/ltl2taa.hh similarity index 96% rename from src/twaalgos/ltl2taa.hh rename to spot/twaalgos/ltl2taa.hh index 9e8dc8e87..05d342344 100644 --- a/src/twaalgos/ltl2taa.hh +++ b/spot/twaalgos/ltl2taa.hh @@ -19,8 +19,8 @@ #pragma once -#include "tl/formula.hh" -#include "twa/taatgba.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/ltl2tgba_fm.cc b/spot/twaalgos/ltl2tgba_fm.cc similarity index 99% rename from src/twaalgos/ltl2tgba_fm.cc rename to spot/twaalgos/ltl2tgba_fm.cc index 63678e24c..63cc0a5f4 100644 --- a/src/twaalgos/ltl2tgba_fm.cc +++ b/spot/twaalgos/ltl2tgba_fm.cc @@ -20,21 +20,21 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "misc/hash.hh" -#include "misc/bddlt.hh" -#include "misc/minato.hh" -#include "tl/nenoform.hh" -#include "tl/print.hh" -#include "tl/apcollect.hh" -#include "tl/mark.hh" -#include "tl/print.hh" +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include "ltl2tgba_fm.hh" -#include "twa/bddprint.hh" -#include "twaalgos/sccinfo.hh" +#include +#include +#include //#include "twaalgos/dot.hh" namespace spot diff --git a/src/twaalgos/ltl2tgba_fm.hh b/spot/twaalgos/ltl2tgba_fm.hh similarity index 98% rename from src/twaalgos/ltl2tgba_fm.hh rename to spot/twaalgos/ltl2tgba_fm.hh index 35cf2e489..e585309ef 100644 --- a/src/twaalgos/ltl2tgba_fm.hh +++ b/spot/twaalgos/ltl2tgba_fm.hh @@ -22,10 +22,10 @@ #pragma once -#include "tl/formula.hh" -#include "twa/twagraph.hh" -#include "tl/apcollect.hh" -#include "tl/simplify.hh" +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/magic.cc b/spot/twaalgos/magic.cc similarity index 98% rename from src/twaalgos/magic.cc rename to spot/twaalgos/magic.cc index 931f46a08..eaec533d2 100644 --- a/src/twaalgos/magic.cc +++ b/spot/twaalgos/magic.cc @@ -31,12 +31,12 @@ #include #include -#include "misc/hash.hh" -#include "twa/twa.hh" -#include "emptiness.hh" -#include "emptiness_stats.hh" -#include "magic.hh" -#include "ndfs_result.hxx" +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/magic.hh b/spot/twaalgos/magic.hh similarity index 97% rename from src/twaalgos/magic.hh rename to spot/twaalgos/magic.hh index 1ec3eb86b..fbb0b412a 100644 --- a/src/twaalgos/magic.hh +++ b/spot/twaalgos/magic.hh @@ -23,9 +23,9 @@ #pragma once #include -#include "twa/fwd.hh" -#include "misc/optionmap.hh" -#include "emptiness.hh" +#include +#include +#include namespace spot { diff --git a/src/twaalgos/mask.cc b/spot/twaalgos/mask.cc similarity index 98% rename from src/twaalgos/mask.cc rename to spot/twaalgos/mask.cc index 7fa799a97..b7cb01791 100644 --- a/src/twaalgos/mask.cc +++ b/spot/twaalgos/mask.cc @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "mask.hh" +#include namespace spot { diff --git a/src/twaalgos/mask.hh b/spot/twaalgos/mask.hh similarity index 99% rename from src/twaalgos/mask.hh rename to spot/twaalgos/mask.hh index 310bbae6f..11815b71f 100644 --- a/src/twaalgos/mask.hh +++ b/spot/twaalgos/mask.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/minimize.cc b/spot/twaalgos/minimize.cc similarity index 97% rename from src/twaalgos/minimize.cc rename to spot/twaalgos/minimize.cc index 200a6da9a..c69e30c5e 100644 --- a/src/twaalgos/minimize.cc +++ b/spot/twaalgos/minimize.cc @@ -32,20 +32,20 @@ #include #include #include -#include "minimize.hh" -#include "misc/hash.hh" -#include "misc/bddlt.hh" -#include "product.hh" -#include "powerset.hh" -#include "gtec/gtec.hh" -#include "strength.hh" -#include "sccfilter.hh" -#include "sccinfo.hh" -#include "ltl2tgba_fm.hh" -#include "bfssteps.hh" -#include "isdet.hh" -#include "complement.hh" -#include "remfin.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/minimize.hh b/spot/twaalgos/minimize.hh similarity index 99% rename from src/twaalgos/minimize.hh rename to spot/twaalgos/minimize.hh index d0e099327..72c94d673 100644 --- a/src/twaalgos/minimize.hh +++ b/spot/twaalgos/minimize.hh @@ -19,8 +19,8 @@ #pragma once -#include "twa/twagraph.hh" -#include "tl/formula.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/ndfs_result.hxx b/spot/twaalgos/ndfs_result.hxx similarity index 99% rename from src/twaalgos/ndfs_result.hxx rename to spot/twaalgos/ndfs_result.hxx index 05d1dc954..a5d5281d1 100644 --- a/src/twaalgos/ndfs_result.hxx +++ b/spot/twaalgos/ndfs_result.hxx @@ -33,12 +33,12 @@ #include #include -#include "misc/hash.hh" -#include "twa/twa.hh" -#include "emptiness.hh" -#include "emptiness_stats.hh" -#include "bfssteps.hh" -#include "misc/hash.hh" +#include +#include +#include +#include +#include +#include namespace spot diff --git a/src/twaalgos/neverclaim.cc b/spot/twaalgos/neverclaim.cc similarity index 96% rename from src/twaalgos/neverclaim.cc rename to spot/twaalgos/neverclaim.cc index 94a43d897..1d92ebf5f 100644 --- a/src/twaalgos/neverclaim.cc +++ b/spot/twaalgos/neverclaim.cc @@ -22,12 +22,12 @@ #include #include -#include "neverclaim.hh" -#include "twa/bddprint.hh" -#include "twa/twagraph.hh" -#include "reachiter.hh" -#include "tl/print.hh" -#include "twa/formula2bdd.hh" +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/neverclaim.hh b/spot/twaalgos/neverclaim.hh similarity index 96% rename from src/twaalgos/neverclaim.hh rename to spot/twaalgos/neverclaim.hh index ac6c2b1c7..0ea7a68d6 100644 --- a/src/twaalgos/neverclaim.hh +++ b/spot/twaalgos/neverclaim.hh @@ -23,8 +23,8 @@ #pragma once #include -#include "twa/fwd.hh" -#include "misc/common.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/postproc.cc b/spot/twaalgos/postproc.cc similarity index 95% rename from src/twaalgos/postproc.cc rename to spot/twaalgos/postproc.cc index 06a70a0c2..0197c602b 100644 --- a/src/twaalgos/postproc.cc +++ b/spot/twaalgos/postproc.cc @@ -17,22 +17,22 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "postproc.hh" -#include "minimize.hh" -#include "simulation.hh" -#include "sccfilter.hh" -#include "degen.hh" -#include "stripacc.hh" +#include +#include +#include +#include +#include +#include #include -#include "misc/optionmap.hh" -#include "powerset.hh" -#include "isdet.hh" -#include "dtbasat.hh" -#include "dtwasat.hh" -#include "complete.hh" -#include "totgba.hh" -#include "sbacc.hh" -#include "sepsets.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/postproc.hh b/spot/twaalgos/postproc.hh similarity index 99% rename from src/twaalgos/postproc.hh rename to spot/twaalgos/postproc.hh index 19cdd43e1..d8e17e5a3 100644 --- a/src/twaalgos/postproc.hh +++ b/spot/twaalgos/postproc.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/powerset.cc b/spot/twaalgos/powerset.cc similarity index 95% rename from src/twaalgos/powerset.cc rename to spot/twaalgos/powerset.cc index fd5ebca9a..a95f49539 100644 --- a/src/twaalgos/powerset.cc +++ b/spot/twaalgos/powerset.cc @@ -23,21 +23,21 @@ #include #include #include -#include "powerset.hh" -#include "misc/hash.hh" -#include "twaalgos/powerset.hh" -#include "twaalgos/sccinfo.hh" -#include "twaalgos/cycles.hh" -#include "twaalgos/gtec/gtec.hh" -#include "twaalgos/product.hh" -#include "twa/bddprint.hh" -#include "twaalgos/gtec/gtec.hh" -#include "twaalgos/sccfilter.hh" -#include "twaalgos/ltl2tgba_fm.hh" -#include "twaalgos/complement.hh" -#include "twaalgos/remfin.hh" -#include "misc/bitvect.hh" -#include "misc/bddlt.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/powerset.hh b/spot/twaalgos/powerset.hh similarity index 99% rename from src/twaalgos/powerset.hh rename to spot/twaalgos/powerset.hh index 10f0caadb..dddbc0025 100644 --- a/src/twaalgos/powerset.hh +++ b/spot/twaalgos/powerset.hh @@ -24,7 +24,7 @@ #include #include -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/product.cc b/spot/twaalgos/product.cc similarity index 97% rename from src/twaalgos/product.cc rename to spot/twaalgos/product.cc index aa061b7cc..42e0a5318 100644 --- a/src/twaalgos/product.cc +++ b/spot/twaalgos/product.cc @@ -17,12 +17,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "product.hh" -#include "twa/twagraph.hh" -#include "twaalgos/complete.hh" +#include +#include +#include #include #include -#include "misc/hash.hh" +#include namespace spot { diff --git a/src/twaalgos/product.hh b/spot/twaalgos/product.hh similarity index 96% rename from src/twaalgos/product.hh rename to spot/twaalgos/product.hh index 1ef1e244b..e504d10d5 100644 --- a/src/twaalgos/product.hh +++ b/spot/twaalgos/product.hh @@ -19,8 +19,8 @@ #pragma once -#include "misc/common.hh" -#include "twa/fwd.hh" +#include +#include #include #include diff --git a/src/twaalgos/projrun.cc b/spot/twaalgos/projrun.cc similarity index 93% rename from src/twaalgos/projrun.cc rename to spot/twaalgos/projrun.cc index 8c36995bc..e9384984e 100644 --- a/src/twaalgos/projrun.cc +++ b/spot/twaalgos/projrun.cc @@ -20,9 +20,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "projrun.hh" -#include "twa/twa.hh" -#include "twaalgos/emptiness.hh" +#include +#include +#include namespace spot { diff --git a/src/twaalgos/projrun.hh b/spot/twaalgos/projrun.hh similarity index 94% rename from src/twaalgos/projrun.hh rename to spot/twaalgos/projrun.hh index 6f5ca0253..940c37d07 100644 --- a/src/twaalgos/projrun.hh +++ b/spot/twaalgos/projrun.hh @@ -22,10 +22,10 @@ #pragma once -#include "misc/common.hh" +#include #include -#include "twa/fwd.hh" -#include "twaalgos/emptiness.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/randomgraph.cc b/spot/twaalgos/randomgraph.cc similarity index 98% rename from src/twaalgos/randomgraph.cc rename to spot/twaalgos/randomgraph.cc index 11002f1b0..8b8298b5b 100644 --- a/src/twaalgos/randomgraph.cc +++ b/spot/twaalgos/randomgraph.cc @@ -20,10 +20,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "randomgraph.hh" -#include "twa/twagraph.hh" -#include "misc/random.hh" -#include "misc/bddlt.hh" +#include +#include +#include +#include #include #include #include diff --git a/src/twaalgos/randomgraph.hh b/spot/twaalgos/randomgraph.hh similarity index 97% rename from src/twaalgos/randomgraph.hh rename to spot/twaalgos/randomgraph.hh index c90d18065..9c9456f2b 100644 --- a/src/twaalgos/randomgraph.hh +++ b/spot/twaalgos/randomgraph.hh @@ -22,10 +22,10 @@ #pragma once -#include "tl/apcollect.hh" -#include "tl/defaultenv.hh" -#include "twa/bdddict.hh" -#include "twa/acc.hh" +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/randomize.cc b/spot/twaalgos/randomize.cc similarity index 96% rename from src/twaalgos/randomize.cc rename to spot/twaalgos/randomize.cc index bd5497861..eb8b29b4f 100644 --- a/src/twaalgos/randomize.cc +++ b/spot/twaalgos/randomize.cc @@ -20,8 +20,8 @@ #include #include #include -#include "randomize.hh" -#include "misc/random.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/randomize.hh b/spot/twaalgos/randomize.hh similarity index 97% rename from src/twaalgos/randomize.hh rename to spot/twaalgos/randomize.hh index c3c1d8083..e4b5920b9 100644 --- a/src/twaalgos/randomize.hh +++ b/spot/twaalgos/randomize.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/reachiter.cc b/spot/twaalgos/reachiter.cc similarity index 99% rename from src/twaalgos/reachiter.cc rename to spot/twaalgos/reachiter.cc index a8111e6b4..0fd5a5a89 100644 --- a/src/twaalgos/reachiter.cc +++ b/spot/twaalgos/reachiter.cc @@ -21,7 +21,7 @@ // along with this program. If not, see . #include -#include "reachiter.hh" +#include namespace spot { diff --git a/src/twaalgos/reachiter.hh b/spot/twaalgos/reachiter.hh similarity index 99% rename from src/twaalgos/reachiter.hh rename to spot/twaalgos/reachiter.hh index f8883c05a..a6d614641 100644 --- a/src/twaalgos/reachiter.hh +++ b/spot/twaalgos/reachiter.hh @@ -22,8 +22,8 @@ #pragma once -#include "misc/hash.hh" -#include "twa/twa.hh" +#include +#include #include #include diff --git a/src/twaalgos/relabel.cc b/spot/twaalgos/relabel.cc similarity index 97% rename from src/twaalgos/relabel.cc rename to spot/twaalgos/relabel.cc index a038d5233..2004df353 100644 --- a/src/twaalgos/relabel.cc +++ b/spot/twaalgos/relabel.cc @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "relabel.hh" +#include namespace spot { diff --git a/src/twaalgos/relabel.hh b/spot/twaalgos/relabel.hh similarity index 94% rename from src/twaalgos/relabel.hh rename to spot/twaalgos/relabel.hh index f5e4273c7..144e73809 100644 --- a/src/twaalgos/relabel.hh +++ b/spot/twaalgos/relabel.hh @@ -19,8 +19,8 @@ #pragma once -#include "tl/relabel.hh" -#include "twa/twagraph.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/remfin.cc b/spot/twaalgos/remfin.cc similarity index 99% rename from src/twaalgos/remfin.cc rename to spot/twaalgos/remfin.cc index 0423510a1..2e403f04b 100644 --- a/src/twaalgos/remfin.cc +++ b/spot/twaalgos/remfin.cc @@ -17,13 +17,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "remfin.hh" -#include "sccinfo.hh" +#include +#include #include -#include "cleanacc.hh" -#include "totgba.hh" -#include "isdet.hh" -#include "mask.hh" +#include +#include +#include +#include //#define TRACE #ifdef TRACE diff --git a/src/twaalgos/remfin.hh b/spot/twaalgos/remfin.hh similarity index 96% rename from src/twaalgos/remfin.hh rename to spot/twaalgos/remfin.hh index f219f1375..378cd14bc 100644 --- a/src/twaalgos/remfin.hh +++ b/spot/twaalgos/remfin.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/remprop.cc b/spot/twaalgos/remprop.cc similarity index 97% rename from src/twaalgos/remprop.cc rename to spot/twaalgos/remprop.cc index ca2e09ed8..b619e3677 100644 --- a/src/twaalgos/remprop.cc +++ b/spot/twaalgos/remprop.cc @@ -17,9 +17,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "remprop.hh" -#include "twaalgos/mask.hh" -#include "misc/casts.hh" +#include +#include +#include #include #include diff --git a/src/twaalgos/remprop.hh b/spot/twaalgos/remprop.hh similarity index 95% rename from src/twaalgos/remprop.hh rename to spot/twaalgos/remprop.hh index 7ba1b37fe..6bc6d425c 100644 --- a/src/twaalgos/remprop.hh +++ b/spot/twaalgos/remprop.hh @@ -20,8 +20,8 @@ #pragma once #include -#include "tl/formula.hh" -#include "twa/twagraph.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/sbacc.cc b/spot/twaalgos/sbacc.cc similarity index 98% rename from src/twaalgos/sbacc.cc rename to spot/twaalgos/sbacc.cc index c01a0afad..66dbc9c27 100644 --- a/src/twaalgos/sbacc.cc +++ b/spot/twaalgos/sbacc.cc @@ -20,7 +20,7 @@ #include #include #include -#include "sbacc.hh" +#include namespace spot { diff --git a/src/twaalgos/sbacc.hh b/spot/twaalgos/sbacc.hh similarity index 96% rename from src/twaalgos/sbacc.hh rename to spot/twaalgos/sbacc.hh index 65a2aade5..68067239d 100644 --- a/src/twaalgos/sbacc.hh +++ b/spot/twaalgos/sbacc.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/sccfilter.cc b/spot/twaalgos/sccfilter.cc similarity index 99% rename from src/twaalgos/sccfilter.cc rename to spot/twaalgos/sccfilter.cc index 9dd844440..154049fee 100644 --- a/src/twaalgos/sccfilter.cc +++ b/spot/twaalgos/sccfilter.cc @@ -17,9 +17,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sccfilter.hh" -#include "reachiter.hh" -#include "sccinfo.hh" +#include +#include +#include namespace spot { diff --git a/src/twaalgos/sccfilter.hh b/spot/twaalgos/sccfilter.hh similarity index 98% rename from src/twaalgos/sccfilter.hh rename to spot/twaalgos/sccfilter.hh index 162e715d9..f428460a7 100644 --- a/src/twaalgos/sccfilter.hh +++ b/spot/twaalgos/sccfilter.hh @@ -19,9 +19,9 @@ #pragma once -#include "misc/common.hh" +#include #include -#include "twa/fwd.hh" +#include namespace spot { diff --git a/src/twaalgos/sccinfo.cc b/spot/twaalgos/sccinfo.cc similarity index 98% rename from src/twaalgos/sccinfo.cc rename to spot/twaalgos/sccinfo.cc index 5126dd3f7..fe4d661f4 100644 --- a/src/twaalgos/sccinfo.cc +++ b/spot/twaalgos/sccinfo.cc @@ -17,13 +17,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sccinfo.hh" +#include #include #include #include -#include "twa/bddprint.hh" -#include "twaalgos/mask.hh" -#include "misc/escape.hh" +#include +#include +#include namespace spot diff --git a/src/twaalgos/sccinfo.hh b/spot/twaalgos/sccinfo.hh similarity index 99% rename from src/twaalgos/sccinfo.hh rename to spot/twaalgos/sccinfo.hh index fc1a0b8f6..51e3b3d9c 100644 --- a/src/twaalgos/sccinfo.hh +++ b/spot/twaalgos/sccinfo.hh @@ -20,7 +20,7 @@ #pragma once #include -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/se05.cc b/spot/twaalgos/se05.cc similarity index 98% rename from src/twaalgos/se05.cc rename to spot/twaalgos/se05.cc index 265a81dde..26befea04 100644 --- a/src/twaalgos/se05.cc +++ b/spot/twaalgos/se05.cc @@ -31,12 +31,12 @@ #include #include -#include "misc/hash.hh" -#include "twa/twa.hh" -#include "emptiness.hh" -#include "emptiness_stats.hh" -#include "se05.hh" -#include "ndfs_result.hxx" +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/se05.hh b/spot/twaalgos/se05.hh similarity index 97% rename from src/twaalgos/se05.hh rename to spot/twaalgos/se05.hh index cd1a45a3b..3e252564a 100644 --- a/src/twaalgos/se05.hh +++ b/spot/twaalgos/se05.hh @@ -23,9 +23,9 @@ #pragma once #include -#include "misc/optionmap.hh" -#include "twa/fwd.hh" -#include "emptiness.hh" +#include +#include +#include namespace spot { diff --git a/src/twaalgos/sepsets.cc b/spot/twaalgos/sepsets.cc similarity index 97% rename from src/twaalgos/sepsets.cc rename to spot/twaalgos/sepsets.cc index a483eb6a4..b4d0c7e55 100644 --- a/src/twaalgos/sepsets.cc +++ b/spot/twaalgos/sepsets.cc @@ -17,8 +17,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sepsets.hh" -#include "sccinfo.hh" +#include +#include namespace spot diff --git a/src/twaalgos/sepsets.hh b/spot/twaalgos/sepsets.hh similarity index 97% rename from src/twaalgos/sepsets.hh rename to spot/twaalgos/sepsets.hh index 334f7d489..5d7d39270 100644 --- a/src/twaalgos/sepsets.hh +++ b/spot/twaalgos/sepsets.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/simulation.cc b/spot/twaalgos/simulation.cc similarity index 98% rename from src/twaalgos/simulation.cc rename to spot/twaalgos/simulation.cc index 3f400babd..fc8aae767 100644 --- a/src/twaalgos/simulation.cc +++ b/spot/twaalgos/simulation.cc @@ -22,14 +22,14 @@ #include #include #include -#include "simulation.hh" -#include "misc/minato.hh" -#include "twa/bddprint.hh" -#include "twaalgos/reachiter.hh" -#include "twaalgos/sccfilter.hh" -#include "twaalgos/sccinfo.hh" -#include "twaalgos/sepsets.hh" -#include "misc/bddlt.hh" +#include +#include +#include +#include +#include +#include +#include +#include // The way we developed this algorithm is the following: We take an // automaton, and reverse all these acceptance conditions. We reverse diff --git a/src/twaalgos/simulation.hh b/spot/twaalgos/simulation.hh similarity index 98% rename from src/twaalgos/simulation.hh rename to spot/twaalgos/simulation.hh index 1f23b2bca..5e4731413 100644 --- a/src/twaalgos/simulation.hh +++ b/spot/twaalgos/simulation.hh @@ -19,8 +19,8 @@ #pragma once -#include "misc/common.hh" -#include "twa/twagraph.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/stats.cc b/spot/twaalgos/stats.cc similarity index 96% rename from src/twaalgos/stats.cc rename to spot/twaalgos/stats.cc index a9ea9bba6..2f352f5a9 100644 --- a/src/twaalgos/stats.cc +++ b/spot/twaalgos/stats.cc @@ -22,12 +22,12 @@ #include #include -#include "twa/twa.hh" -#include "stats.hh" -#include "reachiter.hh" -#include "tl/print.hh" -#include "twaalgos/isdet.hh" -#include "twaalgos/sccinfo.hh" +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/stats.hh b/spot/twaalgos/stats.hh similarity index 98% rename from src/twaalgos/stats.hh rename to spot/twaalgos/stats.hh index 5c75fff48..a77d2ca6f 100644 --- a/src/twaalgos/stats.hh +++ b/spot/twaalgos/stats.hh @@ -22,9 +22,9 @@ #pragma once -#include "twa/twa.hh" +#include #include -#include "misc/formater.hh" +#include namespace spot { diff --git a/src/twaalgos/strength.cc b/spot/twaalgos/strength.cc similarity index 97% rename from src/twaalgos/strength.cc rename to spot/twaalgos/strength.cc index 1aa581bf9..787a95368 100644 --- a/src/twaalgos/strength.cc +++ b/spot/twaalgos/strength.cc @@ -17,10 +17,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "strength.hh" -#include "misc/hash.hh" -#include "isweakscc.hh" -#include "mask.hh" +#include +#include +#include +#include #include namespace spot diff --git a/src/twaalgos/strength.hh b/spot/twaalgos/strength.hh similarity index 99% rename from src/twaalgos/strength.hh rename to spot/twaalgos/strength.hh index 657cd7f6e..a455f2b2a 100644 --- a/src/twaalgos/strength.hh +++ b/spot/twaalgos/strength.hh @@ -19,7 +19,7 @@ #pragma once -#include "sccinfo.hh" +#include namespace spot { diff --git a/src/twaalgos/stripacc.cc b/spot/twaalgos/stripacc.cc similarity index 93% rename from src/twaalgos/stripacc.cc rename to spot/twaalgos/stripacc.cc index 3bc5c2c02..689d844cf 100644 --- a/src/twaalgos/stripacc.cc +++ b/spot/twaalgos/stripacc.cc @@ -17,8 +17,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "stripacc.hh" -#include "reachiter.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/stripacc.hh b/spot/twaalgos/stripacc.hh similarity index 97% rename from src/twaalgos/stripacc.hh rename to spot/twaalgos/stripacc.hh index c8b2e5b68..b94d5558c 100644 --- a/src/twaalgos/stripacc.hh +++ b/spot/twaalgos/stripacc.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/stutter.cc b/spot/twaalgos/stutter.cc similarity index 97% rename from src/twaalgos/stutter.cc rename to spot/twaalgos/stutter.cc index dfc469b9f..53b8d47de 100644 --- a/src/twaalgos/stutter.cc +++ b/spot/twaalgos/stutter.cc @@ -17,20 +17,20 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "stutter.hh" -#include "twa/twa.hh" -#include "misc/hash.hh" -#include "misc/hashfunc.hh" -#include "tl/apcollect.hh" -#include "translate.hh" -#include "tl/remove_x.hh" -#include "twaalgos/product.hh" -#include "twaalgos/ltl2tgba_fm.hh" -#include "twaalgos/isdet.hh" -#include "twaalgos/complement.hh" -#include "twaalgos/remfin.hh" -#include "twa/twaproduct.hh" -#include "twa/bddprint.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/twaalgos/stutter.hh b/spot/twaalgos/stutter.hh similarity index 98% rename from src/twaalgos/stutter.hh rename to spot/twaalgos/stutter.hh index 45842c850..cd189ee50 100644 --- a/src/twaalgos/stutter.hh +++ b/spot/twaalgos/stutter.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/tau03.cc b/spot/twaalgos/tau03.cc similarity index 98% rename from src/twaalgos/tau03.cc rename to spot/twaalgos/tau03.cc index 31f6399ce..7cb6bee20 100644 --- a/src/twaalgos/tau03.cc +++ b/spot/twaalgos/tau03.cc @@ -34,12 +34,12 @@ #include #include -#include "misc/hash.hh" -#include "twa/twa.hh" -#include "emptiness.hh" -#include "emptiness_stats.hh" -#include "tau03.hh" -#include "ndfs_result.hxx" +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/tau03.hh b/spot/twaalgos/tau03.hh similarity index 96% rename from src/twaalgos/tau03.hh rename to spot/twaalgos/tau03.hh index 8e2cc443d..f4f870aa6 100644 --- a/src/twaalgos/tau03.hh +++ b/spot/twaalgos/tau03.hh @@ -22,9 +22,9 @@ #pragma once -#include "misc/optionmap.hh" -#include "twa/fwd.hh" -#include "emptiness.hh" +#include +#include +#include namespace spot { diff --git a/src/twaalgos/tau03opt.cc b/spot/twaalgos/tau03opt.cc similarity index 98% rename from src/twaalgos/tau03opt.cc rename to spot/twaalgos/tau03opt.cc index 17a5bb63f..91cbdb4eb 100644 --- a/src/twaalgos/tau03opt.cc +++ b/spot/twaalgos/tau03opt.cc @@ -44,13 +44,13 @@ #include #include #include -#include "misc/hash.hh" -#include "twa/twa.hh" -#include "emptiness.hh" -#include "emptiness_stats.hh" -#include "tau03opt.hh" -#include "weight.hh" -#include "ndfs_result.hxx" +#include +#include +#include +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/tau03opt.hh b/spot/twaalgos/tau03opt.hh similarity index 97% rename from src/twaalgos/tau03opt.hh rename to spot/twaalgos/tau03opt.hh index 491c2767e..60e3f62bb 100644 --- a/src/twaalgos/tau03opt.hh +++ b/spot/twaalgos/tau03opt.hh @@ -22,9 +22,9 @@ #pragma once -#include "misc/optionmap.hh" -#include "twa/fwd.hh" -#include "emptiness.hh" +#include +#include +#include namespace spot { diff --git a/src/twaalgos/totgba.cc b/spot/twaalgos/totgba.cc similarity index 98% rename from src/twaalgos/totgba.cc rename to spot/twaalgos/totgba.cc index dfe5ad7dd..025c2e532 100644 --- a/src/twaalgos/totgba.cc +++ b/spot/twaalgos/totgba.cc @@ -17,11 +17,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "totgba.hh" -#include "remfin.hh" -#include "cleanacc.hh" -#include "sccinfo.hh" -#include "twa/twagraph.hh" +#include +#include +#include +#include +#include #include #include diff --git a/src/twaalgos/totgba.hh b/spot/twaalgos/totgba.hh similarity index 97% rename from src/twaalgos/totgba.hh rename to spot/twaalgos/totgba.hh index 090313354..0bbbbd65b 100644 --- a/src/twaalgos/totgba.hh +++ b/spot/twaalgos/totgba.hh @@ -19,7 +19,7 @@ #pragma once -#include "twa/twagraph.hh" +#include namespace spot { diff --git a/src/twaalgos/translate.cc b/spot/twaalgos/translate.cc similarity index 95% rename from src/twaalgos/translate.cc rename to spot/twaalgos/translate.cc index d5bcc398b..717fe5359 100644 --- a/src/twaalgos/translate.cc +++ b/spot/twaalgos/translate.cc @@ -17,10 +17,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "translate.hh" -#include "ltl2tgba_fm.hh" -#include "compsusp.hh" -#include "misc/optionmap.hh" +#include +#include +#include +#include namespace spot { diff --git a/src/twaalgos/translate.hh b/spot/twaalgos/translate.hh similarity index 98% rename from src/twaalgos/translate.hh rename to spot/twaalgos/translate.hh index 2756cefb8..29143e2d1 100644 --- a/src/twaalgos/translate.hh +++ b/spot/twaalgos/translate.hh @@ -19,8 +19,8 @@ #pragma once -#include "postproc.hh" -#include "tl/simplify.hh" +#include +#include namespace spot { diff --git a/src/twaalgos/weight.cc b/spot/twaalgos/weight.cc similarity index 98% rename from src/twaalgos/weight.cc rename to spot/twaalgos/weight.cc index 8387fa881..51bf79142 100644 --- a/src/twaalgos/weight.cc +++ b/spot/twaalgos/weight.cc @@ -22,7 +22,7 @@ #include #include -#include "weight.hh" +#include namespace spot { diff --git a/src/twaalgos/weight.hh b/spot/twaalgos/weight.hh similarity index 98% rename from src/twaalgos/weight.hh rename to spot/twaalgos/weight.hh index 5a5e38bc6..355ecd5b5 100644 --- a/src/twaalgos/weight.hh +++ b/spot/twaalgos/weight.hh @@ -25,7 +25,7 @@ #include #include #include -#include "twa/acc.hh" +#include namespace spot { diff --git a/src/twaalgos/word.cc b/spot/twaalgos/word.cc similarity index 96% rename from src/twaalgos/word.cc rename to spot/twaalgos/word.cc index 941775f8d..e83df00e0 100644 --- a/src/twaalgos/word.cc +++ b/spot/twaalgos/word.cc @@ -17,9 +17,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "word.hh" -#include "twa/bddprint.hh" -#include "twa/bdddict.hh" +#include +#include +#include namespace spot { diff --git a/src/twaalgos/word.hh b/spot/twaalgos/word.hh similarity index 97% rename from src/twaalgos/word.hh rename to spot/twaalgos/word.hh index 72f9f72cb..e69706ce3 100644 --- a/src/twaalgos/word.hh +++ b/spot/twaalgos/word.hh @@ -19,7 +19,7 @@ #pragma once -#include "emptiness.hh" +#include namespace spot { diff --git a/wrap/python/Makefile.am b/wrap/python/Makefile.am index 76675791a..8aa71b3d9 100644 --- a/wrap/python/Makefile.am +++ b/wrap/python/Makefile.am @@ -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 diff --git a/wrap/python/ajax/spotcgi.in b/wrap/python/ajax/spotcgi.in index 75f387a97..e88321816 100755 --- a/wrap/python/ajax/spotcgi.in +++ b/wrap/python/ajax/spotcgi.in @@ -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: diff --git a/wrap/python/spot_impl.i b/wrap/python/spot_impl.i index 6c2504fca..262434518 100644 --- a/wrap/python/spot_impl.i +++ b/wrap/python/spot_impl.i @@ -74,80 +74,80 @@ #include #include -#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 +#include +#include +#include +#include +#include -#include "tl/formula.hh" +#include -#include "tl/environment.hh" -#include "tl/defaultenv.hh" +#include +#include -#include "tl/parse.hh" +#include -#include "twa/bdddict.hh" +#include -#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include -#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 +#include +#include +#include +#include +#include -#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "parseaut/public.hh" +#include -#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 +#include +#include +#include +#include +#include +#include +#include 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 +%include +%include +%include +%include +%include %implicitconv std::vector; -%include "tl/formula.hh" +%include namespace std { %template(liststr) list; @@ -256,78 +256,78 @@ namespace std { %template(relabeling_map) map; } -%include "tl/environment.hh" -%include "tl/defaultenv.hh" +%include +%include -%include "tl/parse.hh" +%include /* these must come before apcollect.hh */ -%include "twa/bdddict.hh" -%include "twa/bddprint.hh" -%include "twa/fwd.hh" +%include +%include +%include %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 +%include -%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 +%include +%include +%include +%include +%include +%include +%include +%include +%include -%include "twa/taatgba.hh" -%include "twa/twaproduct.hh" -%include "twa/twagraph.hh" +%include +%include +%include // 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 +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include +%include -%include "parseaut/public.hh" +%include -%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 +%include +%include +%include +%include +%include +%include +%include #undef ltl diff --git a/wrap/python/tests/ltl2tgba.py b/wrap/python/tests/ltl2tgba.py index 2661667d2..596cf88bd 100755 --- a/wrap/python/tests/ltl2tgba.py +++ b/wrap/python/tests/ltl2tgba.py @@ -20,8 +20,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# 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 diff --git a/wrap/python/tests/randgen.py b/wrap/python/tests/randgen.py index f5cfe7b93..094ddcb3f 100755 --- a/wrap/python/tests/randgen.py +++ b/wrap/python/tests/randgen.py @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# This is a python translation of the ltl2tgba C++ test program. -# Compare with src/tgbatest/ltl2tgba.cc. - import spot o = spot.option_map() diff --git a/wrap/python/tests/run.in b/wrap/python/tests/run.in index a7ad71f99..64c54a0b5 100755 --- a/wrap/python/tests/run.in +++ b/wrap/python/tests/run.in @@ -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" &&