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

bin: use regexes to detect shorthands, and add support for owl-21.0

Browse source 
Fixes #480.

* bin/common_trans.cc (shorthands_ltl, shorthands_autproc): Write
those lists using regexes.  Add entries for Owl 21.0.
(show_shorthands, tool_spec): Adjust to use those regexes.
* doc/org/autcross.org, doc/org/ltlcross.org, doc/org/ltldo.org:
Update the list of shorthands.
* tests/core/ltldo.test: Add a couple of tests.
* NEWS: Mention this new feature.
This commit is contained in:
Alexandre Duret-Lutz 2021-11-04 14:12:32 +01:00
parent 97046ea263
commit f99ddef787
6 changed files with 90 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

15
doc/org/autcross.org
View file

@ -105,14 +105,15 @@ autcross --list-shorthands
#+RESULTS:
#+begin_example
If a COMMANDFMT does not use any %-sequence, and starts with one of
the following words, then the string on the right is appended.
the following regexes, then the string on the right is appended.
autfilt %H>%O
dstar2tgba %H>%O
ltl2dstar -B %H %O
nba2dpa <%H>%O
nba2ldpa <%H>%O
seminator %H>%O
autfilt %H>%O
dra2dpa <%H>%O
dstar2tgba %H>%O
ltl2dstar -B %H %O
nba2l?dpa <%H>%O
seminator %H>%O
owl.* (ngba2ldba|nba(2dpa|2det|sim)|aut2parity|gfg-minimization)\b <%H>%O
Any {name} and directory component is skipped for the purpose of
matching those prefixes. So for instance

30
doc/org/ltlcross.org
View file

@ -185,24 +185,20 @@ ltlcross --list-shorthands
#+RESULTS:
#+begin_example
If a COMMANDFMT does not use any %-sequence, and starts with one of
the following words, then the string on the right is appended.
the following regexes, then the string on the right is appended.
delag %f>%O
lbt <%L>%O
ltl2ba -f %s>%O
ltl2da %f>%O
ltl2dgra %f>%O
ltl2dpa %f>%O
ltl2dra %f>%O
ltl2ldba %f>%O
ltl2dstar --output-format=hoa %[MW]L %O
ltl2tgba -H %f>%O
ltl3ba -f %s>%O
ltl3dra -f %s>%O
ltl3hoa -f %f>%O
ltl3tela -f %f>%O
modella %[MWei^]L %O
spin -f %s>%O
delag %f>%O
lbt <%L>%O
ltl2ba -f %s>%O
ltl2(da|dgra|dpa|dra|ldba|na|nba|ngba) %f>%O
ltl2dstar --output-format=hoa %[MW]L %O
ltl2tgba -H %f>%O
ltl3(ba|dra|hoa|tela) -f %s>%O
modella %[MWei^]L %O
spin -f %s>%O
owl.* ltl2[bdeglnpr]+a\b -f %f>%O
owl.* ltl2delta2\b -f %f
owl.* ltl-utilities\b -f %f
Any {name} and directory component is skipped for the purpose of
matching those prefixes. So for instance

37
doc/org/ltldo.org
View file

@ -306,26 +306,26 @@ ltldo --list-shorthands
#+RESULTS:
#+begin_example
If a COMMANDFMT does not use any %-sequence, and starts with one of
the following words, then the string on the right is appended.
the following regexes, then the string on the right is appended.
lbt <%L>%O
ltl2ba -f %s>%O
ltl2da %f>%O
ltl2dpa %f>%O
ltl2ldba %f>%O
ltl2dstar --output-format=hoa %[MW]L %O
ltl2tgba -H %f>%O
ltl3ba -f %s>%O
ltl3dra -f %s>%O
ltl3hoa -f %f>%O
modella %[MWei^]L %O
spin -f %s>%O
delag %f>%O
lbt <%L>%O
ltl2ba -f %s>%O
ltl2(da|dgra|dpa|dra|ldba|na|nba|ngba) %f>%O
ltl2dstar --output-format=hoa %[MW]L %O
ltl2tgba -H %f>%O
ltl3(ba|dra|hoa|tela) -f %s>%O
modella %[MWei^]L %O
spin -f %s>%O
owl.* ltl2[bdeglnpr]+a\b -f %f>%O
owl.* ltl2delta2\b -f %f
owl.* ltl-utilities\b -f %f
Any {name} and directory component is skipped for the purpose of
matching those prefixes. So for instance
'{DRA} ~/mytools/ltl2dstar-0.5.2'
will changed into
'{DRA} ~/mytools/ltl2dstar-0.5.2 --output-format=hoa %[MR]L %O'
will be changed into
'{DRA} ~/mytools/ltl2dstar-0.5.2 --output-format=hoa %[MW]L %O'
#+end_example
Therefore you can type the following to obtain a Dot output (as
@ -353,9 +353,10 @@ digraph "" {
The =ltl2ba= argument passed to =ltldo= was interpreted as if you had
typed ={ltl2ba}ltl2ba -f %s>%O=.
The shorthand is only used if it is the first word of a command
string that does not use any =%= character. This makes it possible to
add options:
Those shorthand patterns are only tested if the command string does
not contains any =%= character. They should always patch a prefix of
the command, ignoring any leading directory. This makes it possible
to add options:
#+BEGIN_SRC sh
ltldo ltl3ba 'ltl3ba -H2' -f GFa --stats='%T, %s states, %e edges'