diff --git a/ChangeLog b/ChangeLog index 1a4989d81..c63d32901 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-08-06 Alexandre Duret-Lutz + + * src/ltlvisit/dotty.hh (dotty): Move the ostream argument first. + * src/ltlvisit/dump.hh (dump): Likewise. + * src/ltltest/equals.cc, src/ltltest/readltl.cc, + src/ltlvisit/dotty.cc, src/ltlvisit/dump.cc: Adjust. + 2003-08-05 Alexandre Duret-Lutz * src/misc/version.hh, src/misc/version.cc: New files. diff --git a/src/ltltest/equals.cc b/src/ltltest/equals.cc index 4ef9c2539..ac89b5341 100644 --- a/src/ltltest/equals.cc +++ b/src/ltltest/equals.cc @@ -41,21 +41,21 @@ main(int argc, char** argv) tmp = f1; f1 = spot::ltl::unabbreviate_logic(f1); spot::ltl::destroy(tmp); - spot::ltl::dump(f1, std::cout); + spot::ltl::dump(std::cout, f1); std::cout << std::endl; #endif #ifdef TUNABBREV tmp = f1; f1 = spot::ltl::unabbreviate_ltl(f1); spot::ltl::destroy(tmp); - spot::ltl::dump(f1, std::cout); + spot::ltl::dump(std::cout, f1); std::cout << std::endl; #endif #ifdef NENOFORM tmp = f1; f1 = spot::ltl::negative_normal_form(f1); spot::ltl::destroy(tmp); - spot::ltl::dump(f1, std::cout); + spot::ltl::dump(std::cout, f1); std::cout << std::endl; #endif diff --git a/src/ltltest/readltl.cc b/src/ltltest/readltl.cc index 2327aa9d6..627808e71 100644 --- a/src/ltltest/readltl.cc +++ b/src/ltltest/readltl.cc @@ -43,9 +43,9 @@ main(int argc, char** argv) if (f) { #ifdef DOTTY - spot::ltl::dotty(f, std::cout); + spot::ltl::dotty(std::cout, f); #else - spot::ltl::dump(f, std::cout); + spot::ltl::dump(std::cout, f); std::cout << std::endl; #endif spot::ltl::destroy(f); diff --git a/src/ltlvisit/dotty.cc b/src/ltlvisit/dotty.cc index a4264ba72..1b64afafe 100644 --- a/src/ltlvisit/dotty.cc +++ b/src/ltlvisit/dotty.cc @@ -101,7 +101,7 @@ namespace spot }; std::ostream& - dotty(const formula* f, std::ostream& os) + dotty(std::ostream& os, const formula* f) { dotty_visitor::map m; dotty_visitor v(os, m); diff --git a/src/ltlvisit/dotty.hh b/src/ltlvisit/dotty.hh index 6c25b2168..4a29b2e05 100644 --- a/src/ltlvisit/dotty.hh +++ b/src/ltlvisit/dotty.hh @@ -9,12 +9,12 @@ namespace spot namespace ltl { /// \brief Write a formula tree using dot's syntax. - /// \param f The formula to translate. /// \param os The stream where it should be output. + /// \param f The formula to translate. /// /// \c dot is part of the GraphViz package /// http://www.research.att.com/sw/tools/graphviz/ - std::ostream& dotty(const formula* f, std::ostream& os); + std::ostream& dotty(std::ostream& os, const formula* f); } } diff --git a/src/ltlvisit/dump.cc b/src/ltlvisit/dump.cc index 4a1aca511..d4868a668 100644 --- a/src/ltlvisit/dump.cc +++ b/src/ltlvisit/dump.cc @@ -69,7 +69,7 @@ namespace spot }; std::ostream& - dump(const formula* f, std::ostream& os) + dump(std::ostream& os, const formula* f) { dump_visitor v(os); f->accept(v); diff --git a/src/ltlvisit/dump.hh b/src/ltlvisit/dump.hh index d6498e2c4..60fc9b820 100644 --- a/src/ltlvisit/dump.hh +++ b/src/ltlvisit/dump.hh @@ -9,11 +9,11 @@ namespace spot namespace ltl { /// \brief Dump a formula tree. - /// \param f The formula to dump. /// \param os The stream where it should be output. + /// \param f The formula to dump. /// /// This is useful to display a formula when debugging. - std::ostream& dump(const formula* f, std::ostream& os); + std::ostream& dump(std::ostream& os, const formula* f); } }