From 47e9ac108fbc92da574f30b3494e0431b8e68c29 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 22 Jun 2004 22:27:53 +0000 Subject: [PATCH] * src/ltlvisit/basicreduce.hh: New file, extracted from ... * src/ltlvisit/reducform.hh: ... here. * src/ltlvisit/basereduc.cc: Rename as ... * src/ltlvisit/basicreduce.cc: ... this, to match the function name. * src/ltlvisit/Makefile.am (ltlvisit_HEADERS, libltlvisit_la_SOURCES): Adjust filenames. * src/ltlvisit/reducform.cc: Adjust includes. --- ChangeLog | 8 ++++ src/ltlvisit/Makefile.am | 3 +- src/ltlvisit/{basereduc.cc => basicreduce.cc} | 8 ++-- src/ltlvisit/basicreduce.hh | 41 +++++++++++++++++++ src/ltlvisit/reducform.cc | 1 + src/ltlvisit/reducform.hh | 14 +------ 6 files changed, 58 insertions(+), 17 deletions(-) rename src/ltlvisit/{basereduc.cc => basicreduce.cc} (99%) create mode 100644 src/ltlvisit/basicreduce.hh diff --git a/ChangeLog b/ChangeLog index 460f1b2fb..8fb459f42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2004-06-23 Alexandre Duret-Lutz + * src/ltlvisit/basicreduce.hh: New file, extracted from ... + * src/ltlvisit/reducform.hh: ... here. + * src/ltlvisit/basereduc.cc: Rename as ... + * src/ltlvisit/basicreduce.cc: ... this, to match the function name. + * src/ltlvisit/Makefile.am (ltlvisit_HEADERS, libltlvisit_la_SOURCES): + Adjust filenames. + * src/ltlvisit/reducform.cc: Adjust includes. + * src/ltlvisit/lunabbrev.hh: Revert superfluous change from 2004-05-10. diff --git a/src/ltlvisit/Makefile.am b/src/ltlvisit/Makefile.am index c337bbdc0..863d591ff 100644 --- a/src/ltlvisit/Makefile.am +++ b/src/ltlvisit/Makefile.am @@ -25,6 +25,7 @@ AM_CXXFLAGS = $(WARNING_CXXFLAGS) ltlvisitdir = $(pkgincludedir)/ltlvisit ltlvisit_HEADERS = \ + basicreduce.hh \ clone.hh \ destroy.hh \ dotty.hh \ @@ -40,7 +41,7 @@ ltlvisit_HEADERS = \ noinst_LTLIBRARIES = libltlvisit.la libltlvisit_la_SOURCES = \ - basereduc.cc \ + basicreduce.cc \ clone.cc \ destroy.cc \ dotty.cc \ diff --git a/src/ltlvisit/basereduc.cc b/src/ltlvisit/basicreduce.cc similarity index 99% rename from src/ltlvisit/basereduc.cc rename to src/ltlvisit/basicreduce.cc index fb94c37e8..50881d3d1 100644 --- a/src/ltlvisit/basereduc.cc +++ b/src/ltlvisit/basicreduce.cc @@ -19,13 +19,13 @@ // Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. -#include "reducform.hh" +#include "basicreduce.hh" +#include "ltlast/visitor.hh" #include "ltlast/allnodes.hh" #include -#include "ltlvisit/clone.hh" -#include "ltlvisit/destroy.hh" -#include "ltlvisit/dump.hh" +#include "clone.hh" +#include "destroy.hh" namespace spot { diff --git a/src/ltlvisit/basicreduce.hh b/src/ltlvisit/basicreduce.hh new file mode 100644 index 000000000..f7bd51f31 --- /dev/null +++ b/src/ltlvisit/basicreduce.hh @@ -0,0 +1,41 @@ +// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), +// département Systèmes Répartis Coopératifs (SRC), Université Pierre +// et Marie Curie. +// +// 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 2 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 Spot; see the file COPYING. If not, write to the Free +// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +// 02111-1307, USA. + +#ifndef SPOT_LTLVISIT_BASICREDUCE_HH +# define SPOT_LTLVISIT_BASICREDUCE_HH + +#include "ltlast/formula.hh" + +namespace spot +{ + namespace ltl + { + /// Basic rewritings. + formula* basic_reduce(const formula* f); + + /// Whether a formula starts with GF. + bool is_GF(const formula* f); + /// Whether a formula starts with FG. + bool is_FG(const formula* f); + } +} + +#endif // SPOT_LTLVISIT_BASICREDUCE_HH diff --git a/src/ltlvisit/reducform.cc b/src/ltlvisit/reducform.cc index 599608271..c04814262 100644 --- a/src/ltlvisit/reducform.cc +++ b/src/ltlvisit/reducform.cc @@ -20,6 +20,7 @@ // 02111-1307, USA. #include "reducform.hh" +#include "basicreduce.hh" #include "syntimpl.hh" #include "ltlast/allnodes.hh" #include diff --git a/src/ltlvisit/reducform.hh b/src/ltlvisit/reducform.hh index 4446ae0d7..4e43eae86 100644 --- a/src/ltlvisit/reducform.hh +++ b/src/ltlvisit/reducform.hh @@ -53,13 +53,8 @@ namespace spot /// \return the reduced formula formula* reduce(const formula* f, int opt = Reduce_All); - /// Basic rewritings. - formula* basic_reduce(const formula* f); - /// \brief Check whether a formula is eventual. /// - /// FIXME: Describe what eventual formulae are. Cite paper. - /// This comes from /// \verbatim /// @InProceedings{ etessami.00.concur, @@ -72,21 +67,16 @@ namespace spot /// editor = {C. Palamidessi}, /// volume = {1877}, /// series = {Lecture Notes in Computer Science}, - /// publisher = {Springer-Verlag} + /// publisher = {Springer-Verlag} /// } /// \endverbatim - + /// FIXME: Describe what eventual formulae are. bool is_eventual(const formula* f); /// \brief Check whether a formula is universal. /// /// FIXME: Describe what universal formulae are. Cite paper. bool is_universal(const formula* f); - - /// Whether a formula starts with GF. - bool is_GF(const formula* f); - /// Whether a formula starts with FG. - bool is_FG(const formula* f); } }