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

hoaparse: rename to parseaut

Browse source 
Because this parser is not specific to HOA anymore.

* src/hoaparse/Makefile.am, src/hoaparse/fmterror.cc,
src/hoaparse/hoaparse.yy, src/hoaparse/parsedecl.hh,
src/parseaut/public.hh, src/hoaparse/hoascan.ll,
src/tests/hoaparse.test: Rename to...
* src/parseaut/Makefile.am, src/parseaut/fmterror.cc,
src/parseaut/parseaut.yy, src/parseaut/parsedecl.hh,
src/hoaparse/public.hh, src/parseaut/scanaut.ll,
src/tests/parseaut.test: ... these, and also adjust the name internally.
For instance hoa_aut_ptr is now parsed_aut_ptr; hoa_stream_parser is now
automaton_stream_parser, and hoa_parse() has become parse_aut().
* NEWS, README, configure.ac, doc/org/tut20.org, src/Makefile.am,
src/bin/autfilt.cc, src/bin/common_aoutput.cc,
src/bin/common_aoutput.hh, src/bin/common_conv.cc,
src/bin/ltlcross.cc, src/bin/ltldo.cc, src/tests/Makefile.am,
src/tests/complementation.cc, src/tests/ltl2tgba.cc,
src/tests/readsave.test, wrap/python/ajax/spot.in,
wrap/python/spot.py, wrap/python/spot_impl.i,
wrap/python/tests/automata-io.ipynb, wrap/python/tests/parsetgba.py:
Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2015-06-11 08:42:39 +02:00
parent 60bd9dd606
commit a86391ab77
29 changed files with 158 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tests/Makefile.am
View file

@ -171,7 +171,7 @@ TESTS_twa = \
nondet.test \
det.test \
neverclaimread.test \
hoaparse.test \
parseaut.test \
optba.test \
complete.test \
remfin.test \

14
src/tests/complementation.cc
View file

@ -21,7 +21,7 @@
#include <iostream>
#include "twaalgos/dot.hh"
#include "twaalgos/hoa.hh"
#include "hoaparse/public.hh"
#include "parseaut/public.hh"
#include "twa/twaproduct.hh"
#include "twaalgos/gtec/gtec.hh"
#include "twaalgos/ltl2tgba_fm.hh"
@ -121,9 +121,9 @@ int main(int argc, char* argv[])
if (print_automaton || print_safra)
{
spot::ltl::environment& env(spot::ltl::default_environment::instance());
spot::hoa_parse_error_list pel;
auto h = spot::hoa_parse(file, pel, dict, env);
if (spot::format_hoa_parse_errors(std::cerr, file, pel))
spot::parse_aut_error_list pel;
auto h = spot::parse_aut(file, pel, dict, env);
if (spot::format_parse_aut_errors(std::cerr, file, pel))
return 2;
spot::twa_graph_ptr a = h->aut;
@ -178,10 +178,10 @@ int main(int argc, char* argv[])
}
else
{
spot::hoa_parse_error_list pel;
spot::parse_aut_error_list pel;
spot::ltl::environment& env(spot::ltl::default_environment::instance());
auto h = spot::hoa_parse(file, pel, dict, env);
if (spot::format_hoa_parse_errors(std::cerr, file, pel))
auto h = spot::parse_aut(file, pel, dict, env);
if (spot::format_parse_aut_errors(std::cerr, file, pel))
return 2;
a = h->aut;
}

10
src/tests/ltl2tgba.cc
View file

@ -40,7 +40,7 @@
#include "twa/twaproduct.hh"
#include "twaalgos/reducerun.hh"
#include "dstarparse/public.hh"
#include "hoaparse/public.hh"
#include "parseaut/public.hh"
#include "twaalgos/dupexp.hh"
#include "twaalgos/minimize.hh"
#include "taalgos/minimize.hh"
@ -608,9 +608,9 @@ checked_main(int argc, char** argv)
tm.start("reading -P's argument");
spot::dstar_parse_error_list pel;
auto daut = spot::hoa_parse(argv[formula_index] + 2, pel,
auto daut = spot::parse_aut(argv[formula_index] + 2, pel,
dict, env, debug_opt);
if (spot::format_hoa_parse_errors(std::cerr,
if (spot::format_parse_aut_errors(std::cerr,
argv[formula_index] + 2, pel))
return 2;
daut->aut->merge_transitions();
@ -1014,9 +1014,9 @@ checked_main(int argc, char** argv)
{
spot::dstar_parse_error_list pel;
tm.start("parsing hoa");
auto daut = spot::hoa_parse(input, pel, dict, env, debug_opt);
auto daut = spot::parse_aut(input, pel, dict, env, debug_opt);
tm.stop("parsing hoa");
if (spot::format_hoa_parse_errors(std::cerr, input, pel))
if (spot::format_parse_aut_errors(std::cerr, input, pel))
return 2;
daut->aut->merge_transitions();
a = daut->aut;

0
src/tests/hoaparse.test → src/tests/parseaut.test
View file

2
src/tests/readsave.test
View file

@ -567,7 +567,7 @@ EOF
# autfilt should complain about the input (we only check the exit
# status here, because the actual error messages are tested in
# hoaparse.test) and produce a valid output with the number of states
# parseaut.test) and produce a valid output with the number of states
# fixed, and the missing state definitions.
$autfilt -H input >output1 && exit 1