tgbaparse: Return a tgba_digraph.
* src/tgbaparse/parsedecl.hh, src/tgbaparse/public.hh, src/tgbaparse/tgbaparse.yy: Adjust to return a tgba_digraph. * src/priv/accmap.hh: New file to help creating acceptance conditions from strings. * src/priv/Makefile.am: Add accmap.hh * src/tgba/tgbagraph.hh (tgba_digraph::named_t): New typedef. * wrap/python/spot.i: Declare that tgba_digraph inherits from tgba. * src/tgbatest/complementation.cc, src/tgbatest/explpro2.test, src/tgbatest/explpro3.test, src/tgbatest/explpro4.test, src/tgbatest/explprod.cc, src/tgbatest/explprod.test, src/tgbatest/ltl2tgba.cc, src/tgbatest/maskacc.cc, src/tgbatest/maskacc.test, src/tgbatest/mixprod.cc, src/tgbatest/powerset.cc, src/tgbatest/randtgba.test, src/tgbatest/readsave.test, src/tgbatest/tgbaread.cc, src/tgbatest/tgbaread.test, src/tgbatest/tripprod.cc, src/tgbatest/tripprod.test: Adjust to the change.
This commit is contained in:
parent
c0b28dc9c8
commit
4170080c35
24 changed files with 277 additions and 159 deletions
|
|
@ -676,7 +676,7 @@ main(int argc, char** argv)
|
|||
tm.start("reading -P's argument");
|
||||
|
||||
spot::tgba_parse_error_list pel;
|
||||
spot::tgba_explicit_string* s;
|
||||
spot::tgba_digraph* s;
|
||||
s = spot::tgba_parse(argv[formula_index] + 2,
|
||||
pel, dict, env, env, debug_opt);
|
||||
if (spot::format_tgba_parse_errors(std::cerr,
|
||||
|
|
@ -1096,6 +1096,7 @@ main(int argc, char** argv)
|
|||
{
|
||||
case ReadSpot:
|
||||
{
|
||||
spot::tgba_digraph* e;
|
||||
spot::tgba_parse_error_list pel;
|
||||
tm.start("parsing automaton");
|
||||
to_free = a = e = spot::tgba_parse(input, pel, dict,
|
||||
|
|
@ -1107,6 +1108,7 @@ main(int argc, char** argv)
|
|||
delete dict;
|
||||
return 2;
|
||||
}
|
||||
e->merge_transitions();
|
||||
}
|
||||
break;
|
||||
case ReadNeverclaim:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue