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
15857385a5
commit
44d9e34e32
7 changed files with 54 additions and 8 deletions
|
|
@ -45,6 +45,7 @@ output_format_t output_format = spot_output;
|
|||
bool full_parenth = false;
|
||||
bool escape_csv = false;
|
||||
char output_terminator = '\n';
|
||||
bool output_ratexp = false;
|
||||
|
||||
static const argp_option options[] =
|
||||
{
|
||||
|
|
@ -105,7 +106,10 @@ stream_formula(std::ostream& out,
|
|||
report_not_ltl(f, filename, linenum, "LBT");
|
||||
break;
|
||||
case spot_output:
|
||||
spot::print_psl(out, f, full_parenth);
|
||||
if (output_ratexp)
|
||||
spot::print_sere(out, f, full_parenth);
|
||||
else
|
||||
spot::print_psl(out, f, full_parenth);
|
||||
break;
|
||||
case spin_output:
|
||||
if (f.is_ltl_formula())
|
||||
|
|
@ -120,10 +124,16 @@ stream_formula(std::ostream& out,
|
|||
report_not_ltl(f, filename, linenum, "Wring");
|
||||
break;
|
||||
case utf8_output:
|
||||
spot::print_utf8_psl(out, f, full_parenth);
|
||||
if (output_ratexp)
|
||||
spot::print_utf8_sere(out, f, full_parenth);
|
||||
else
|
||||
spot::print_utf8_psl(out, f, full_parenth);
|
||||
break;
|
||||
case latex_output:
|
||||
spot::print_latex_psl(out, f, full_parenth);
|
||||
if (output_ratexp)
|
||||
spot::print_latex_sere(out, f, full_parenth);
|
||||
else
|
||||
spot::print_latex_psl(out, f, full_parenth);
|
||||
break;
|
||||
case count_output:
|
||||
case quiet_output:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue