improve coverage of LaTeX/utf8 printers for SERE
* bin/common_output.cc, bin/common_output.hh, bin/randltl.cc: Adjust so that running "randltl -S" use the SERE flavor of the spot/latex/utf8 formula printers. * tests/core/latex.test, tests/core/utf8.test, tests/python/ltlparse.py: Add more test cases.
This commit is contained in:
parent
95e3bb815c
commit
7358a26492
7 changed files with 54 additions and 8 deletions
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2013, 2015 Laboratoire de Recherche et Développement
|
||||
# de l'Epita (LRDE).
|
||||
# Copyright (C) 2013, 2015, 2023 Laboratoire de Recherche et
|
||||
# Développement de l'Epita (LRDE).
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
#
|
||||
|
|
@ -50,7 +50,8 @@ cat <<\EOF
|
|||
EOF
|
||||
( ltlfilt --latex input --format='\texttt{%F:%L} & $%f$ \\';
|
||||
genltl --go-theta=1..3 --latex \
|
||||
--format='\texttt{--%F:%L} & $%f$ \\')
|
||||
--format='\texttt{--%F:%L} & $%f$ \\';
|
||||
randltl -S -n10 --latex 2 --format='\texttt{random %l} & $%f$ \\')
|
||||
cat <<\EOF
|
||||
\end{tabular}
|
||||
\end{document}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2012, 2013, 2015, 2016, 2019 Laboratoire de Recherche et
|
||||
# Copyright (C) 2012, 2013, 2015, 2016, 2019, 2023 Laboratoire de Recherche et
|
||||
# Développement de l'Epita (LRDE).
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
|
|
@ -70,3 +70,18 @@ ltlfilt -8 -f 'X[!]a' >out
|
|||
diff in out
|
||||
ltlfilt -8 -F in >out
|
||||
diff in out
|
||||
|
||||
randltl --sere -8 --seed 0 --tree-size 8 a b c -n 10 > formulae
|
||||
cat >expected <<EOF
|
||||
0
|
||||
b:{1 | [*0]}[:*1..3]
|
||||
c̅
|
||||
a | [*0]
|
||||
b[*2..3]
|
||||
1
|
||||
{a∨b}[*][:*]
|
||||
b
|
||||
a
|
||||
[*0]
|
||||
EOF
|
||||
diff formulae expected
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# -*- mode: python; coding: utf-8 -*-
|
||||
# Copyright (C) 2009-2012, 2014-2017, 2019, 2021-2022 Laboratoire de
|
||||
# Copyright (C) 2009-2012, 2014-2017, 2019, 2021-2023 Laboratoire de
|
||||
# Recherche et Développement de l'Epita (LRDE).
|
||||
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
|
|
@ -219,3 +219,19 @@ f = spot.formula_G(2, spot.formula_unbounded(), spot.formula_ap("a"))
|
|||
tc.assertEqual(f, spot.formula("XXG(a)"))
|
||||
f = spot.formula_F(2, spot.formula_unbounded(), spot.formula_ap("a"))
|
||||
tc.assertEqual(f, spot.formula("XXF(a)"))
|
||||
|
||||
|
||||
pf = spot.parse_infix_sere('a[->3]')
|
||||
tc.assertEqual(spot.str_sere(pf.f), 'a[->3]')
|
||||
tc.assertEqual(spot.str_latex_sere(pf.f), 'a\\SereGoto{3}')
|
||||
pf = spot.parse_infix_sere('(!b)[*];b;(!b)[*]')
|
||||
tc.assertEqual(spot.str_sere(pf.f), 'b[=1]')
|
||||
pf = spot.parse_infix_sere('b[=1]')
|
||||
tc.assertEqual(spot.str_sere(pf.f), 'b[=1]')
|
||||
tc.assertEqual(spot.str_latex_sere(pf.f), 'b\\SereEqual{1}')
|
||||
tc.assertEqual(spot.str_sclatex_sere(pf.f), 'b^{=1}')
|
||||
pf = spot.parse_infix_sere('(!b)[*];b')
|
||||
tc.assertEqual(spot.str_sere(pf.f), 'b[->]')
|
||||
pf = spot.parse_infix_sere('b[->1]')
|
||||
tc.assertEqual(spot.str_latex_sere(pf.f), 'b\\SereGoto{}')
|
||||
tc.assertEqual(spot.str_sclatex_sere(pf.f), 'b^{\\to}')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue