alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add options to %x to list atomic propositions

Browse source 
* bin/common_aoutput.cc, bin/common_aoutput.hh, bin/common_output.cc,
bin/common_output.hh: Add options to %x to list atomic propositions
with various quoting scheme.  Deprecate --format=%a in favor of the
new --format=%x for consistency with --stats=%x.
* tests/core/format.test, tests/core/remprop.test: Adjust and add more
tests.
* NEWS: Mention these changes.
This commit is contained in:
Alexandre Duret-Lutz 2017-03-01 16:02:09 +01:00
parent 68ad391948
commit 18283d6907
7 changed files with 169 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

18
bin/common_output.hh
View file

@ -36,9 +36,18 @@ extern output_format_t output_format;
extern bool full_parenth;
extern bool escape_csv;
#define COMMON_X_OUTPUT_SPECS(where) \
"number of atomic propositions " #where "; " \
" add LETTERS to list atomic propositions with " \
"(n) no quoting, " \
"(s) occasional double-quotes with C-style escape, " \
"(d) double-quotes with C-style escape, " \
"(c) double-quotes with CSV-style escape, " \
"(p) between parentheses, " \
"any extra non-alphanumeric character will be used to " \
"separate propositions"
#define COMMON_LTL_OUTPUT_SPECS \
{ "%a", 0, nullptr, OPTION_DOC | OPTION_NO_USAGE, \
"number of atomic propositions used in the formula", 0 }, \
{ "%s", 0, nullptr, OPTION_DOC | OPTION_NO_USAGE, \
"the length (or size) of the formula", 0 }, \
{ "%b", 0, nullptr, OPTION_DOC | OPTION_NO_USAGE, \
@ -47,7 +56,10 @@ extern bool escape_csv;
{ "%h, %[vw]h", 0, nullptr, OPTION_DOC | OPTION_NO_USAGE, \
"the class of the formula is the Manna-Pnueli hierarchy " \
"([v] replaces abbreviations by class names, [w] for all " \
"compatible classes)", 0 }
"compatible classes)", 0 }, \
{ "%x, %[LETTERS]X, %[LETTERS]x", 0, nullptr, \
OPTION_DOC | OPTION_NO_USAGE, \
COMMON_X_OUTPUT_SPECS(used in the formula), 0 }
extern const struct argp output_argp;