From 12401fe91ac8520c6c49cb92c2d3498cf9030670 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 1 Dec 2014 17:34:13 +0100 Subject: [PATCH] ltlfile: remove unused file * src/ltlparse/ltlfile.cc, src/ltlparse/ltlfile.hh: Delete. * src/ltlparse/Makefile.am: Adjust. --- src/ltlparse/Makefile.am | 7 ++-- src/ltlparse/ltlfile.cc | 69 ---------------------------------------- src/ltlparse/ltlfile.hh | 47 --------------------------- 3 files changed, 2 insertions(+), 121 deletions(-) delete mode 100644 src/ltlparse/ltlfile.cc delete mode 100644 src/ltlparse/ltlfile.hh diff --git a/src/ltlparse/Makefile.am b/src/ltlparse/Makefile.am index 076ebbc5d..c754ed045 100644 --- a/src/ltlparse/Makefile.am +++ b/src/ltlparse/Makefile.am @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- -## Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 Laboratoire de -## Recherche et Développement de l'Epita (LRDE). +## Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Laboratoire +## de Recherche et Développement de l'Epita (LRDE). ## Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris ## 6 (LIP6), département Systèmes Répartis Coopératifs (SRC), ## Université Pierre et Marie Curie. @@ -53,11 +53,8 @@ EXTRA_DIST = $(LTLPARSE_YY) libltlparse_la_SOURCES = \ fmterror.cc \ $(FROM_LTLPARSE_YY) \ - ltlfile.cc \ ltlscan.ll \ parsedecl.hh ltlparse_HEADERS = \ - ltlfile.hh \ public.hh - diff --git a/src/ltlparse/ltlfile.cc b/src/ltlparse/ltlfile.cc deleted file mode 100644 index 5bff76426..000000000 --- a/src/ltlparse/ltlfile.cc +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (C) 2010, 2012 Laboratoire de Recherche et Développement -// de l'Epita (LRDE). -// -// This file is part of Spot, a model checking library. -// -// Spot is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 3 of the License, or -// (at your option) any later version. -// -// Spot is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -// License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -#include "ltlfile.hh" -#include "public.hh" - -namespace spot -{ - namespace ltl - { - - ltl_file::ltl_file(const std::string& filename) - : in(filename.c_str()) - { - if (!in) - { - std::cerr << "Cannot open " << filename << std::endl; - exit(2); - } - } - - ltl_file::ltl_file(const char* filename) - : in(filename) - { - if (!in) - { - std::cerr << "Cannot open " << filename << std::endl; - exit(2); - } - } - - const formula* ltl_file::next() - { - if (!in.good()) - return 0; - - std::string input; - do - { - if (!std::getline(in, input)) - return 0; - } - while (input == ""); - - spot::ltl::parse_error_list pel; - const formula* f = parse(input, pel); - int ret = spot::ltl::format_parse_errors(std::cerr, input, pel); - if (ret) - exit(ret); - return f; - } - - } -} diff --git a/src/ltlparse/ltlfile.hh b/src/ltlparse/ltlfile.hh deleted file mode 100644 index 91a0817f6..000000000 --- a/src/ltlparse/ltlfile.hh +++ /dev/null @@ -1,47 +0,0 @@ -// -*- coding: utf-8 -*- -// Copyright (C) 2010, 2012, 2013 Laboratoire de Recherche et -// Développement de l'Epita (LRDE). -// -// This file is part of Spot, a model checking library. -// -// Spot is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 3 of the License, or -// (at your option) any later version. -// -// Spot is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -// License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -#ifndef SPOT_LTLPARSE_LTLFILE_HH -# define SPOT_LTLPARSE_LTLFILE_HH -#include -#include "ltlast/formula.hh" - - -namespace spot -{ - namespace ltl - { - - /// \ingroup ltl_io - /// \brief Read LTL formulae from a file, one by one - class SPOT_API ltl_file - { - public: - ltl_file(const std::string& filename); - ltl_file(const char* filename); - /// Return the next parsed LTL formula, and 0 at end of file. - const formula* next(); - private: - std::ifstream in; - }; - - } -} - -#endif