diff --git a/bin/common_output.cc b/bin/common_output.cc index c3407a7fd..55448b079 100644 --- a/bin/common_output.cc +++ b/bin/common_output.cc @@ -1,6 +1,6 @@ // -*- coding: utf-8 -*- -// Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017 Laboratoire de Recherche et -// Développement de l'Epita (LRDE). +// Copyright (C) 2012-2018 Laboratoire de Recherche et Développement +// de l'Epita (LRDE). // // This file is part of Spot, a model checking library. // @@ -390,12 +390,6 @@ output_formula(std::ostream& out, } } -void -::printable_formula::print(std::ostream& os, const char*) const -{ - output_formula(os, val_); -} - void output_formula_checked(spot::formula f, spot::process_timer* ptimer, const char* filename, int linenum, diff --git a/bin/common_output.hh b/bin/common_output.hh index 751160898..6850eeda6 100644 --- a/bin/common_output.hh +++ b/bin/common_output.hh @@ -1,6 +1,6 @@ // -*- coding: utf-8 -*- -// Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017 Laboratoire de Recherche -// et Développement de l'Epita (LRDE). +// Copyright (C) 2012-2018 Laboratoire de Recherche et Développement +// de l'Epita (LRDE). // // This file is part of Spot, a model checking library. // @@ -82,41 +82,3 @@ void output_formula_checked(spot::formula f, const char* filename = nullptr, int linenum = 0, const char* prefix = nullptr, const char* suffix = nullptr); - - -class printable_formula: - public spot::printable_value -{ -public: - printable_formula& - operator=(spot::formula new_val) - { - val_ = new_val; - return *this; - } - - virtual void - print(std::ostream& os, const char*) const override; -}; - -class aut_stat_printer: protected spot::stat_printer -{ -public: - aut_stat_printer(std::ostream& os, const char* format) - : spot::stat_printer(os, format) - { - declare('f', &formula_); // Override the formula printer. - } - - using spot::formater::set_output; - - std::ostream& - print(const spot::const_twa_graph_ptr& aut, - spot::formula f = nullptr) - { - formula_ = f; - return this->spot::stat_printer::print(aut, f); - } - - printable_formula formula_; -};