Commit graph

4 commits

Author SHA1 Message Date
Alexandre Duret-Lutz
d1f915c748 merge tunnabrev/lunnabrev/wmunabbrev into a single function
* src/ltlvisit/lunabbrev.cc, src/ltlvisit/lunabbrev.hh,
src/ltlvisit/tunabbrev.cc, src/ltlvisit/tunabbrev.hh,
src/ltlvisit/wmunabbrev.cc, src/ltlvisit/wmunabbrev.hh: Delete.
* src/ltlvisit/unabbrev.cc, src/ltlvisit/unabbrev.hh: New files.
* src/ltlvisit/Makefile.am: Adjust.
* src/ltlvisit/print.cc, src/tests/equalsf.cc, src/tests/Makefile.am,
src/twaalgos/ltl2taa.cc, wrap/python/spot_impl.i, src/bin/ltlfilt.cc:
Adjust callers.
* src/ltlvisit/contain.cc, src/tests/syntimpl.cc: Remove useless
include.
* wrap/python/tests/formulas.ipynb: New test cases.
* doc/tl/tl.tex: Group all rules in a single section.
* NEWS: Mention it.
2015-08-17 17:38:47 +02:00
Alexandre Duret-Lutz
8fb7b279f7 ltlvisit: rename tostring.hh as print.hh and rename printer functions
This actually performs three related changes, but separating them
would be quite inconvenient.

1) rename tostring.hh to print.hh a welcome side-effect is that
I could fix several files that included this file for not reason.

2) de-overload some of the to_string functions, and rename them
as follow:

  to_string -> print_psl, print_sere, str_psl, str_sere
  to_utf8_string -> print_utf8_psl, print_utf8_sere,
                    str_utf8_psl, str_utf8_sere
  to_spin_string -> print_spin_ltl, str_spin_ltl
  to_wring_string -> print_wring_ltl, str_wing_ltl
  to_lbt_string -> print_lbt_ltl, str_lbt_ltl
  to_latex_string -> print_latex_psl, str_latex_psl
  to_sclatex_string -> print_sclatex_psl, str_sclatex_psl

Now it is clearer what these functions do, and their restrictions.

3) all those print_* functions now take the stream to write onto
as their first argument.  This fixes #88.

* src/ltlvisit/tostring.cc, src/ltlvisit/tostring.hh: Rename into...
* src/ltlvisit/print.cc, src/ltlvisit/print.hh: ... those, and make
the changes listed above.
* doc/org/tut01.org, src/bin/common_output.cc,
src/bin/common_trans.cc, src/bin/ltl2tgba.cc, src/bin/ltl2tgta.cc,
src/bin/ltlcross.cc, src/bin/ltldo.cc, src/bin/ltlfilt.cc,
src/bin/randltl.cc, src/ltlparse/ltlparse.yy,
src/ltlvisit/Makefile.am, src/ltlvisit/mark.cc,
src/ltlvisit/relabel.cc, src/ltlvisit/simplify.cc,
src/ltlvisit/snf.cc, src/ta/taexplicit.cc, src/ta/tgtaexplicit.cc,
src/taalgos/tgba2ta.cc, src/tests/equalsf.cc, src/tests/ltl2tgba.cc,
src/tests/ltlrel.cc, src/tests/randtgba.cc, src/tests/reduc.cc,
src/tests/syntimpl.cc, src/tests/tostring.cc, src/twa/bdddict.cc,
src/twa/bddprint.cc, src/twa/taatgba.cc, src/twa/taatgba.hh,
src/twa/twagraph.cc, src/twaalgos/compsusp.cc, src/twaalgos/lbtt.cc,
src/twaalgos/ltl2taa.cc, src/twaalgos/ltl2tgba_fm.cc,
src/twaalgos/neverclaim.cc, src/twaalgos/remprop.cc,
src/twaalgos/stats.cc, wrap/python/ajax/spot.in, wrap/python/spot.py,
wrap/python/spot_impl.i: Adjust.
2015-06-04 22:56:57 +02:00
Alexandre Duret-Lutz
98790f5345 ltlparse: rename the main functions
parse         -> parse_infix_psl
parse_lbt     -> parse_prefix_ltl
parse_sere    -> parse_infix_sere
parse_boolean -> parse_infix_boolean

Fixes #87.

* src/ltlparse/ltlparse.yy, src/ltlparse/public.hh:
Do the above changes.
* doc/mainpage.dox, doc/org/tut01.org, iface/ltsmin/modelcheck.cc,
src/bin/common_finput.cc, src/hoaparse/hoaparse.yy,
src/kripkeparse/kripkeparse.yy, src/tests/checkpsl.cc,
src/tests/checkta.cc, src/tests/complementation.cc,
src/tests/consterm.cc, src/tests/emptchk.cc, src/tests/equalsf.cc,
src/tests/kind.cc, src/tests/length.cc, src/tests/ltl2tgba.cc,
src/tests/ltlprod.cc, src/tests/ltlrel.cc, src/tests/randtgba.cc,
src/tests/readltl.cc, src/tests/reduc.cc, src/tests/syntimpl.cc,
src/tests/tostring.cc, wrap/python/ajax/spot.in,
wrap/python/tests/alarm.py, wrap/python/tests/interdep.py,
wrap/python/tests/ltl2tgba.py, wrap/python/tests/ltlparse.py: Adjust.
2015-06-04 09:26:57 +02:00
Etienne Renault
66bd8f34db Merge kripketest, graphtest and ltltest into tests
* README, configure.ac, iface/ltsmin/Makefile.am,
src/tests/defs.in, src/tests/.gitignore, src/tests/Makefile.am,
src/Makefile.am: update references.
* src/kripketest/.gitignore, src/kripketest/Makefile.am,
src/kripketest/defs.in, src/graphtest/.gitignore,
src/graphtest/Makefile.am,
src/graphtest/defs.in, src/ltltest/.cvsignore,
src/ltltest/.gitignore, src/ltltest/Makefile.am,
src/ltltest/defs.in:: remove files.
* src/kripketest/bad_parsing.test, src/kripketest/kripke.test,
src/kripketest/origin, src/kripketest/parse_print_test.cc,
src/ltltest/bare.test, src/ltltest/consterm.cc,
src/ltltest/consterm.test, src/tests/defs.in,
src/ltltest/equals.test, src/ltltest/equalsf.cc,
src/ltltest/eventuniv.test, src/ltltest/exclusive-ltl.test,
src/graphtest/graph.cc, src/graphtest/graph.test,
src/ltltest/isop.test, src/ltltest/kind.cc,
src/ltltest/kind.test, src/ltltest/latex.test,
src/ltltest/lbt.test, src/ltltest/length.cc,
src/ltltest/length.test, src/ltltest/lenient.test,
src/ltltest/ltlcrossgrind.test, src/ltltest/ltlfilt.test,
src/ltltest/ltlgrind.test, src/ltltest/ltlrel.cc,
src/ltltest/ltlrel.test, src/ltltest/lunabbrev.test,
src/ltltest/nenoform.test, src/graphtest/ngraph.cc,
src/graphtest/ngraph.test, src/ltltest/parse.test,
src/ltltest/parseerr.test, src/ltltest/rand.test,
src/ltltest/readltl.cc, src/ltltest/reduc.cc,
src/ltltest/reduc.test, src/ltltest/reduc0.test,
src/ltltest/reduccmp.test, src/ltltest/reducpsl.test,
src/ltltest/remove_x.test, src/ltltest/stutter-ltl.test,
src/ltltest/syntimpl.cc, src/ltltest/syntimpl.test,
src/graphtest/tgbagraph.test, src/ltltest/tostring.cc,
src/ltltest/tostring.test, src/ltltest/tunabbrev.test,
src/ltltest/tunenoform.test, src/graphtest/twagraph.cc,
src/ltltest/unabbrevwm.test,src/ltltest/utf8.test,
src/ltltest/uwrm.test: rename as...
* src/tests/bad_parsing.test, src/tests/kripke.test,
src/tests/origin, src/tests/parse_print_test.cc,
src/tests/bare.test, src/tests/consterm.cc,
src/tests/consterm.test, src/tests/equals.test,
src/tests/equalsf.cc, src/tests/eventuniv.test,
src/tests/exclusive-ltl.test, src/tests/graph.cc,
src/tests/graph.test, src/tests/isop.test,
src/tests/kind.cc, src/tests/kind.test,
src/tests/latex.test, src/tests/lbt.test,
src/tests/length.cc, src/tests/length.test,
src/tests/lenient.test, src/tests/ltlcrossgrind.test,
src/tests/ltlfilt.test, src/tests/ltlgrind.test,
src/tests/ltlrel.cc, src/tests/ltlrel.test,
src/tests/lunabbrev.test, src/tests/nenoform.test,
src/tests/ngraph.cc, src/tests/ngraph.test,
src/tests/parse.test, src/tests/parseerr.test,
src/tests/rand.test, src/tests/readltl.cc,
src/tests/reduc.cc, src/tests/reduc.test,
src/tests/reduc0.test, src/tests/reduccmp.test,
src/tests/reducpsl.test, src/tests/remove_x.test,
src/tests/stutter-ltl.test, src/tests/syntimpl.cc,
src/tests/syntimpl.test, src/tests/tgbagraph.test,
src/tests/tostring.cc, src/tests/tostring.test,
src/tests/tunabbrev.test, src/tests/tunenoform.test,
src/tests/twagraph.cc, src/tests/unabbrevwm.test,
src/tests/utf8.test, src/tests/uwrm.test: ...these!
2015-04-24 13:57:56 +02:00
Renamed from src/ltltest/equalsf.cc (Browse further)