From b229bfc224f43f69ba05d82311b45507c712c577 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 10 Jun 2015 00:10:22 +0200 Subject: [PATCH] rename hoa_reachable as print_hoa As actually claimed (but not done) by 738f939ff834a5cb57094a26192aac77aa93cec9. * src/twaalgos/hoa.hh, src/twaalgos/hoa.cc: Rename it. * src/bin/common_aoutput.cc, src/bin/dstar2tgba.cc, src/bin/ltlcross.cc, src/tests/complementation.cc, src/tests/ltl2tgba.cc, src/tests/randtgba.cc, src/twaalgos/hoa.cc, wrap/python/spot.py: Adjust. --- src/bin/common_aoutput.cc | 2 +- src/bin/dstar2tgba.cc | 2 +- src/bin/ltlcross.cc | 2 +- src/tests/complementation.cc | 2 +- src/tests/ltl2tgba.cc | 2 +- src/tests/randtgba.cc | 2 +- src/twaalgos/hoa.cc | 6 +++--- src/twaalgos/hoa.hh | 2 +- wrap/python/spot.py | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/bin/common_aoutput.cc b/src/bin/common_aoutput.cc index d6294806e..ab8ea4b15 100644 --- a/src/bin/common_aoutput.cc +++ b/src/bin/common_aoutput.cc @@ -328,7 +328,7 @@ automaton_printer::print(const spot::twa_graph_ptr& aut, spot::print_lbtt(*out, aut, false); break; case Hoa: - spot::hoa_reachable(*out, aut, hoa_opt) << '\n'; + spot::print_hoa(*out, aut, hoa_opt) << '\n'; break; case Spin: spot::print_never_claim(*out, aut, opt_never); diff --git a/src/bin/dstar2tgba.cc b/src/bin/dstar2tgba.cc index b1f66d986..4f7694c3d 100644 --- a/src/bin/dstar2tgba.cc +++ b/src/bin/dstar2tgba.cc @@ -397,7 +397,7 @@ namespace spot::print_lbtt(*out, aut, false); break; case Hoa: - spot::hoa_reachable(*out, aut, hoa_opt) << '\n'; + spot::print_hoa(*out, aut, hoa_opt) << '\n'; break; case Spin: spot::print_never_claim(*out, aut, opt_never); diff --git a/src/bin/ltlcross.cc b/src/bin/ltlcross.cc index b390cb697..c699997a5 100644 --- a/src/bin/ltlcross.cc +++ b/src/bin/ltlcross.cc @@ -722,7 +722,7 @@ namespace if (opt_automata) { std::ostringstream os; - spot::hoa_reachable(os, res, "l"); + spot::print_hoa(os, res, "l"); st->hoa_str = os.str(); } } diff --git a/src/tests/complementation.cc b/src/tests/complementation.cc index aed0a2f30..525e7e17a 100644 --- a/src/tests/complementation.cc +++ b/src/tests/complementation.cc @@ -134,7 +134,7 @@ int main(int argc, char* argv[]) if (print_automaton) { if (save_hoa) - spot::hoa_reachable(std::cout, complement, nullptr); + spot::print_hoa(std::cout, complement, nullptr); else spot::print_dot(std::cout, complement); } diff --git a/src/tests/ltl2tgba.cc b/src/tests/ltl2tgba.cc index bfd8a87ee..840675544 100644 --- a/src/tests/ltl2tgba.cc +++ b/src/tests/ltl2tgba.cc @@ -1594,7 +1594,7 @@ checked_main(int argc, char** argv) } case 17: { - hoa_reachable(std::cout, a, hoa_opt) << '\n'; + print_hoa(std::cout, a, hoa_opt) << '\n'; break; } default: diff --git a/src/tests/randtgba.cc b/src/tests/randtgba.cc index 0dfb7d3d2..bf5844285 100644 --- a/src/tests/randtgba.cc +++ b/src/tests/randtgba.cc @@ -924,7 +924,7 @@ main(int argc, char** argv) if (!opt_ec) { if (!opt_0 && !opt_dot) - hoa_reachable(std::cout, a, nullptr); + print_hoa(std::cout, a, nullptr); } else { diff --git a/src/twaalgos/hoa.cc b/src/twaalgos/hoa.cc index 8152ed677..b03b0c722 100644 --- a/src/twaalgos/hoa.cc +++ b/src/twaalgos/hoa.cc @@ -236,7 +236,7 @@ namespace spot }; static std::ostream& - hoa_reachable(std::ostream& os, + print_hoa(std::ostream& os, const const_twa_graph_ptr& aut, const char* opt) { @@ -511,7 +511,7 @@ namespace spot } std::ostream& - hoa_reachable(std::ostream& os, + print_hoa(std::ostream& os, const const_twa_ptr& aut, const char* opt) { @@ -520,7 +520,7 @@ namespace spot if (!a) a = make_twa_graph(aut, twa::prop_set::all()); - return hoa_reachable(os, a, opt); + return print_hoa(os, a, opt); } } diff --git a/src/twaalgos/hoa.hh b/src/twaalgos/hoa.hh index 94f7517a0..182cbd579 100644 --- a/src/twaalgos/hoa.hh +++ b/src/twaalgos/hoa.hh @@ -36,7 +36,7 @@ namespace spot /// transition-based acceptance, (m) mixed acceptance, (l) /// single-line output. SPOT_API std::ostream& - hoa_reachable(std::ostream& os, + print_hoa(std::ostream& os, const const_twa_ptr& g, const char* opt); } diff --git a/wrap/python/spot.py b/wrap/python/spot.py index 275e8306c..2f413b39d 100644 --- a/wrap/python/spot.py +++ b/wrap/python/spot.py @@ -124,7 +124,7 @@ def _twa_to_str(a, format='hoa', opt=None): format = format.lower() if format == 'hoa': ostr = ostringstream() - hoa_reachable(ostr, a, opt) + print_hoa(ostr, a, opt) return ostr.str() if format == 'dot': ostr = ostringstream()