Commit b229bfc2 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

rename hoa_reachable as print_hoa

As actually claimed (but not done) by
738f939f.

* 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.
parent 2dee90b3
...@@ -328,7 +328,7 @@ automaton_printer::print(const spot::twa_graph_ptr& aut, ...@@ -328,7 +328,7 @@ automaton_printer::print(const spot::twa_graph_ptr& aut,
spot::print_lbtt(*out, aut, false); spot::print_lbtt(*out, aut, false);
break; break;
case Hoa: case Hoa:
spot::hoa_reachable(*out, aut, hoa_opt) << '\n'; spot::print_hoa(*out, aut, hoa_opt) << '\n';
break; break;
case Spin: case Spin:
spot::print_never_claim(*out, aut, opt_never); spot::print_never_claim(*out, aut, opt_never);
......
...@@ -397,7 +397,7 @@ namespace ...@@ -397,7 +397,7 @@ namespace
spot::print_lbtt(*out, aut, false); spot::print_lbtt(*out, aut, false);
break; break;
case Hoa: case Hoa:
spot::hoa_reachable(*out, aut, hoa_opt) << '\n'; spot::print_hoa(*out, aut, hoa_opt) << '\n';
break; break;
case Spin: case Spin:
spot::print_never_claim(*out, aut, opt_never); spot::print_never_claim(*out, aut, opt_never);
......
...@@ -722,7 +722,7 @@ namespace ...@@ -722,7 +722,7 @@ namespace
if (opt_automata) if (opt_automata)
{ {
std::ostringstream os; std::ostringstream os;
spot::hoa_reachable(os, res, "l"); spot::print_hoa(os, res, "l");
st->hoa_str = os.str(); st->hoa_str = os.str();
} }
} }
......
...@@ -134,7 +134,7 @@ int main(int argc, char* argv[]) ...@@ -134,7 +134,7 @@ int main(int argc, char* argv[])
if (print_automaton) if (print_automaton)
{ {
if (save_hoa) if (save_hoa)
spot::hoa_reachable(std::cout, complement, nullptr); spot::print_hoa(std::cout, complement, nullptr);
else else
spot::print_dot(std::cout, complement); spot::print_dot(std::cout, complement);
} }
......
...@@ -1594,7 +1594,7 @@ checked_main(int argc, char** argv) ...@@ -1594,7 +1594,7 @@ checked_main(int argc, char** argv)
} }
case 17: case 17:
{ {
hoa_reachable(std::cout, a, hoa_opt) << '\n'; print_hoa(std::cout, a, hoa_opt) << '\n';
break; break;
} }
default: default:
......
...@@ -924,7 +924,7 @@ main(int argc, char** argv) ...@@ -924,7 +924,7 @@ main(int argc, char** argv)
if (!opt_ec) if (!opt_ec)
{ {
if (!opt_0 && !opt_dot) if (!opt_0 && !opt_dot)
hoa_reachable(std::cout, a, nullptr); print_hoa(std::cout, a, nullptr);
} }
else else
{ {
......
...@@ -236,7 +236,7 @@ namespace spot ...@@ -236,7 +236,7 @@ namespace spot
}; };
static std::ostream& static std::ostream&
hoa_reachable(std::ostream& os, print_hoa(std::ostream& os,
const const_twa_graph_ptr& aut, const const_twa_graph_ptr& aut,
const char* opt) const char* opt)
{ {
...@@ -511,7 +511,7 @@ namespace spot ...@@ -511,7 +511,7 @@ namespace spot
} }
std::ostream& std::ostream&
hoa_reachable(std::ostream& os, print_hoa(std::ostream& os,
const const_twa_ptr& aut, const const_twa_ptr& aut,
const char* opt) const char* opt)
{ {
...@@ -520,7 +520,7 @@ namespace spot ...@@ -520,7 +520,7 @@ namespace spot
if (!a) if (!a)
a = make_twa_graph(aut, twa::prop_set::all()); a = make_twa_graph(aut, twa::prop_set::all());
return hoa_reachable(os, a, opt); return print_hoa(os, a, opt);
} }
} }
...@@ -36,7 +36,7 @@ namespace spot ...@@ -36,7 +36,7 @@ namespace spot
/// transition-based acceptance, (m) mixed acceptance, (l) /// transition-based acceptance, (m) mixed acceptance, (l)
/// single-line output. /// single-line output.
SPOT_API std::ostream& SPOT_API std::ostream&
hoa_reachable(std::ostream& os, print_hoa(std::ostream& os,
const const_twa_ptr& g, const const_twa_ptr& g,
const char* opt); const char* opt);
} }
...@@ -124,7 +124,7 @@ def _twa_to_str(a, format='hoa', opt=None): ...@@ -124,7 +124,7 @@ def _twa_to_str(a, format='hoa', opt=None):
format = format.lower() format = format.lower()
if format == 'hoa': if format == 'hoa':
ostr = ostringstream() ostr = ostringstream()
hoa_reachable(ostr, a, opt) print_hoa(ostr, a, opt)
return ostr.str() return ostr.str()
if format == 'dot': if format == 'dot':
ostr = ostringstream() ostr = ostringstream()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment