Skip to content

GitLab

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

Merge all ltlast/ files into formula.hh. The forward declaration of visitor... 

Merge all ltlast/ files into formula.hh.  The forward declaration of visitor was causing error messages too cryptic for users.
parent 9afbaf63
Hide whitespace changes
Inline Side-by-side
ChangeLog
View file @ 25a31142
2008-06-12 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Merge all ltlast/ files into formula.hh. The forward declaration
of visitor was causing error messages too cryptic for users.
* src/ltlast/allnodes.hh, src/ltlast/atomic_prop.hh,
src/ltlast/binop.hh, src/ltlast/constant.hh, src/ltlast/multop.hh,
src/ltlast/refformula.hh, src/ltlast/unop.hh,
src/ltlast/visitor.hh: Delete and merge all these files into ...
* src/ltlast/formula.hh: ... this one.
* src/ltlast/Makefile.am: Adjust.
* ltlparse/ltlparse.yy, ltlparse/public.hh, ltltest/equals.cc,
ltltest/randltl.cc, ltltest/readltl.cc, ltltest/reduc.cc,
ltltest/syntimpl.cc, ltltest/tostring.cc, ltlvisit/apcollect.hh,
ltlvisit/basicreduce.cc, ltlvisit/clone.cc, ltlvisit/clone.hh,
ltlvisit/contain.cc, ltlvisit/dotty.cc, ltlvisit/dump.cc,
ltlvisit/lunabbrev.cc, ltlvisit/nenoform.cc, ltlvisit/nenoform.hh,
ltlvisit/postfix.cc, ltlvisit/postfix.hh, ltlvisit/randomltl.cc,
ltlvisit/reduce.cc, ltlvisit/reduce.hh, ltlvisit/simpfg.cc,
ltlvisit/syntimpl.cc, ltlvisit/tostring.cc, ltlvisit/tunabbrev.cc,
tgba/bdddict.cc, tgba/formula2bdd.cc, tgba/tgbaexplicit.cc,
tgba/tgbatba.cc, tgbaalgos/ltl2tgba_fm.cc,
tgbaalgos/ltl2tgba_lacim.cc, tgbaalgos/randomgraph.cc,
tgbaalgos/randomgraph.hh, tgbaalgos/save.cc, tgbaparse/public.hh,
tgbaparse/tgbaparse.yy, tgbatest/explicit.cc,
tgbatest/explprod.cc, tgbatest/ltl2tgba.cc, tgbatest/ltlprod.cc,
tgbatest/mixprod.cc, tgbatest/powerset.cc, tgbatest/randtgba.cc,
tgbatest/readsave.cc, tgbatest/reductgba.cc, tgbatest/tgbaread.cc,
tgbatest/tripprod.cc: Adjust includes.
2008-06-12 Alexandre Duret-Lutz <adl@lrde.epita.fr> 2008-06-12 Alexandre Duret-Lutz <adl@lrde.epita.fr>
* src/ltlast/atomic_prop.cc, src/ltlast/binop.cc, * src/ltlast/atomic_prop.cc, src/ltlast/binop.cc,
......
src/ltlast/Makefile.am
View file @ 25a31142
## Copyright (C) 2003 Laboratoire d'Informatique de Paris 6 (LIP6), ## Copyright (C) 2003, 2008 Laboratoire d'Informatique de Paris 6 (LIP6),
## département Systèmes Répartis Coopératifs (SRC), Université Pierre ## département Systèmes Répartis Coopératifs (SRC), Université Pierre
## et Marie Curie. ## et Marie Curie.
## ##
...@@ -21,13 +21,4 @@ ...@@ -21,13 +21,4 @@
ltlastdir = $(pkgincludedir)/ltlast ltlastdir = $(pkgincludedir)/ltlast
ltlast_HEADERS = \ ltlast_HEADERS = formula.hh
allnodes.hh \
atomic_prop.hh \
binop.hh \
constant.hh \
formula.hh \
multop.hh \
refformula.hh \
unop.hh \
visitor.hh
src/ltlast/allnodes.hh deleted 100644 → 0
View file @ 9afbaf63
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// dpartement Systmes Rpartis Coopratifs (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.
/// \file ltlast/allnodes.hh
/// \brief Define all LTL node types.
///
/// This file is usually needed when \b defining a visitor.
#ifndef SPOT_LTLAST_ALLNODES_HH
# define SPOT_LTLAST_ALLNODES_HH
# include "binop.hh"
# include "unop.hh"
# include "multop.hh"
# include "atomic_prop.hh"
# include "constant.hh"
#endif // SPOT_LTLAST_ALLNODES_HH
src/ltlast/atomic_prop.hh deleted 100644 → 0
View file @ 9afbaf63
// Copyright (C) 2008 Laboratoire d'Informatique de Paris 6 (LIP6),
// dpartement Systmes Rpartis Coopratifs (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.
/// \file ltlast/atomic_prop.hh
/// \brief LTL atomic propositions
#ifndef SPOT_LTLAST_ATOMIC_PROP_HH
# define SPOT_LTLAST_ATOMIC_PROP_HH
# include "formula.hh"
# include "internal/atomic_prop.hh"
namespace spot
{
namespace ltl
{
/// \brief Atomic propositions.
/// \ingroup ltl_ast
typedef spot::internal::atomic_prop<ltl_t> atomic_prop;
}
}
#endif // SPOT_LTLAST_ATOMICPROP_HH
src/ltlast/binop.hh deleted 100644 → 0
View file @ 9afbaf63
// Copyright (C) 2008 Laboratoire d'Informatique de Paris 6 (LIP6),
// dpartement Systmes Rpartis Coopratifs (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.
/// \file ltlast/binop.hh
/// \brief LTL binary operators
///
/// This does not include \c AND and \c OR operators. These are
/// considered to be multi-operand operators (see spot::ltl::multop).
#ifndef SPOT_LTLAST_BINOP_HH
# define SPOT_LTLAST_BINOP_HH
# include "formula.hh"
# include "internal/binop.hh"
namespace spot
{
namespace ltl
{
/// \brief Binary operator.
/// \ingroup ltl_ast
typedef spot::internal::binop<ltl_t> binop;
}
}
#endif // SPOT_LTLAST_BINOP_HH
src/ltlast/constant.hh deleted 100644 → 0
View file @ 9afbaf63
// 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.
//
// 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.
/// \file ltlast/constant.hh
/// \brief LTL constants
#ifndef SPOT_LTLAST_CONSTANT_HH
# define SPOT_LTLAST_CONSTANT_HH
# include "formula.hh"
# include "internal/constant.hh"
namespace spot
{
namespace ltl
{
/// \brief A constant (True or False)
/// \ingroup ltl_ast
typedef spot::internal::constant<ltl_t> constant;
}
}
#endif // SPOT_LTLAST_CONSTANT_HH
src/ltlast/formula.hh
View file @ 25a31142
...@@ -20,11 +20,16 @@ ...@@ -20,11 +20,16 @@
// 02111-1307, USA. // 02111-1307, USA.
/// \file ltlast/formula.hh /// \file ltlast/formula.hh
/// \brief LTL formula interface /// \brief LTL formula, AST and visitor interface
#ifndef SPOT_LTLAST_FORMULA_HH #ifndef SPOT_LTLAST_FORMULA_HH
# define SPOT_LTLAST_FORMULA_HH # define SPOT_LTLAST_FORMULA_HH
# include "internal/formula.hh" # include "internal/formula.hh"
# include "internal/atomic_prop.hh"
# include "internal/constant.hh"
# include "internal/unop.hh"
# include "internal/binop.hh"
# include "internal/multop.hh"
namespace spot namespace spot
{ {
...@@ -118,6 +123,68 @@ namespace spot ...@@ -118,6 +123,68 @@ namespace spot
typedef spot::internal::formula_ptr_less_than<ltl_t> formula_ptr_less_than; typedef spot::internal::formula_ptr_less_than<ltl_t> formula_ptr_less_than;
typedef spot::internal::formula_ptr_hash<ltl_t> formula_ptr_hash; typedef spot::internal::formula_ptr_hash<ltl_t> formula_ptr_hash;
/// \brief Atomic propositions.
/// \ingroup ltl_ast
typedef spot::internal::atomic_prop<ltl_t> atomic_prop;
/// \brief A constant (True or False)
/// \ingroup ltl_ast
typedef spot::internal::constant<ltl_t> constant;
/// \brief Unary operators.
/// \ingroup ltl_ast
typedef spot::internal::unop<ltl_t> unop;
/// \brief Binary operator.
/// \ingroup ltl_ast
typedef spot::internal::binop<ltl_t> binop;
/// \brief Multi-operand operators.
/// \ingroup ltl_ast
///
/// These operators are considered commutative and associative.
typedef spot::internal::multop<ltl_t> multop;
/// \brief Formula visitor that can modify the formula.
/// \ingroup ltl_essential
///
/// Writing visitors is the prefered way
/// to traverse a formula, since it doesn't
/// involve any cast.
///
/// If you do not need to modify the visited formula, inherit from
/// spot::ltl:const_visitor instead.
struct visitor
{
virtual ~visitor() {}
virtual void visit(atomic_prop* node) = 0;
virtual void visit(constant* node) = 0;
virtual void visit(binop* node) = 0;
virtual void visit(unop* node) = 0;
virtual void visit(multop* node) = 0;
};
/// \brief Formula visitor that cannot modify the formula.
///
/// Writing visitors is the prefered way
/// to traverse a formula, since it doesn't
/// involve any cast.
///
/// If you want to modify the visited formula, inherit from
/// spot::ltl:visitor instead.
struct const_visitor
{
virtual ~const_visitor() {}
virtual void visit(const atomic_prop* node) = 0;
virtual void visit(const constant* node) = 0;
virtual void visit(const binop* node) = 0;
virtual void visit(const unop* node) = 0;
virtual void visit(const multop* node) = 0;
};
} }
} }
......
src/ltlast/multop.hh deleted 100644 → 0
View file @ 9afbaf63
// Copyright (C) 2008 Laboratoire d'Informatique de Paris 6 (LIP6),
// dpartement Systmes Rpartis Coopratifs (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.
/// \file ltlast/multop.hh
/// \brief LTL multi-operand operators
#ifndef SPOT_LTLAST_MULTOP_HH
# define SPOT_LTLAST_MULTOP_HH
# include "formula.hh"
# include "internal/multop.hh"
namespace spot
{
namespace ltl
{
/// \brief Multi-operand operators.
/// \ingroup ltl_ast
///
/// These operators are considered commutative and associative.
typedef spot::internal::multop<ltl_t> multop;
}
}
#endif // SPOT_LTLAST_MULTOP_HH
src/ltlast/refformula.hh deleted 100644 → 0
View file @ 9afbaf63
// Copyright (C) 2008 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.
/// \file ltlast/refformula.hh
/// \brief Reference-counted LTL formulae
#ifndef SPOT_LTLAST_REFFORMULA_HH
# define SPOT_LTLAST_REFFORMULA_HH
# include "formula.hh"
# include "internal/refformula.hh"
namespace spot
{
namespace ltl
{
/// \brief A reference-counted LTL formula.
/// \ingroup ltl_ast
typedef spot::internal::ref_formula<ltl_t> ref_formula;
}
}
#endif // SPOT_LTLAST_REFFORMULA_HH
src/ltlast/unop.hh deleted 100644 → 0
View file @ 9afbaf63
// Copyright (C) 2008 Laboratoire d'Informatique de Paris 6 (LIP6),
// dpartement Systmes Rpartis Coopratifs (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.
/// \file ltlast/unop.hh
/// \brief LTL unary operators
#ifndef SPOT_LTLAST_UNOP_HH
# define SPOT_LTLAST_UNOP_HH
# include "formula.hh"
# include "internal/unop.hh"
namespace spot
{
namespace ltl
{
/// \brief Unary operators.
/// \ingroup ltl_ast
typedef spot::internal::unop<ltl_t> unop;
}
}
#endif // SPOT_LTLAST_UNOP_HH
src/ltlast/visitor.hh deleted 100644 → 0
View file @ 9afbaf63
// Copyright (C) 2003, 2004, 2005, 2008 Laboratoire d'Informatique de
// Paris 6 (LIP6), dpartement Systmes Rpartis Coopratifs (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.
/// \file ltlast/visitor.hh
/// \brief LTL visitor interface
#ifndef SPOT_LTLAST_VISITOR_HH
# define SPOT_LTLAST_VISITOR_HH
# include "binop.hh"
# include "unop.hh"
# include "multop.hh"
# include "atomic_prop.hh"
# include "constant.hh"
namespace spot
{
namespace ltl
{
/// \brief Formula visitor that can modify the formula.
/// \ingroup ltl_essential
///
/// Writing visitors is the prefered way
/// to traverse a formula, since it doesn't
/// involve any cast.
///
/// If you do not need to modify the visited formula, inherit from
/// spot::ltl:const_visitor instead.
struct visitor
{
virtual ~visitor() {}
virtual void visit(atomic_prop* node) = 0;
virtual void visit(constant* node) = 0;
virtual void visit(binop* node) = 0;
virtual void visit(unop* node) = 0;
virtual void visit(multop* node) = 0;
};
/// \brief Formula visitor that cannot modify the formula.
///
/// Writing visitors is the prefered way
/// to traverse a formula, since it doesn't
/// involve any cast.
///
/// If you want to modify the visited formula, inherit from
/// spot::ltl:visitor instead.
struct const_visitor
{
virtual ~const_visitor() {}
virtual void visit(const atomic_prop* node) = 0;
virtual void visit(const constant* node) = 0;
virtual void visit(const binop* node) = 0;
virtual void visit(const unop* node) = 0;
virtual void visit(const multop* node) = 0;
};
}
}
#endif // SPOT_LTLAST_VISITOR_HH
src/ltlparse/ltlparse.yy
View file @ 25a31142
/* Copyright (C) 2003, 2004, 2005, 2006 Laboratoire d'Informatique de /* Copyright (C) 2003, 2004, 2005, 2006, 2008 Laboratoire d'Informatique de
** Paris 6 (LIP6), dpartement Systmes Rpartis Coopratifs (SRC), ** Paris 6 (LIP6), dpartement Systmes Rpartis Coopratifs (SRC),
** Universit Pierre et Marie Curie. ** Universit Pierre et Marie Curie.
** **
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
%{ %{
#include <string> #include <string>
#include "public.hh" #include "public.hh"
#include "ltlast/allnodes.hh"
#include "ltlvisit/destroy.hh" #include "ltlvisit/destroy.hh"
%} %}
......
src/ltlparse/public.hh
View file @ 25a31142
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
# define SPOT_LTLPARSE_PUBLIC_HH # define SPOT_LTLPARSE_PUBLIC_HH
# include "ltlast/formula.hh" # include "ltlast/formula.hh"
# include "ltlast/visitor.hh"
// Unfortunately Bison 2.3 uses the same guards in all parsers :( // Unfortunately Bison 2.3 uses the same guards in all parsers :(
# undef BISON_LOCATION_HH # undef BISON_LOCATION_HH
# undef BISON_POSITION_HH # undef BISON_POSITION_HH
......
src/ltltest/equals.cc
View file @ 25a31142
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include "ltlvisit/nenoform.hh" #include "ltlvisit/nenoform.hh"
#include "ltlvisit/destroy.hh" #include "ltlvisit/destroy.hh"
#include "ltlvisit/contain.hh" #include "ltlvisit/contain.hh"
#include "ltlast/allnodes.hh"
#include "ltlvisit/reduce.hh" #include "ltlvisit/reduce.hh"
#include "ltlvisit/tostring.hh" #include "ltlvisit/tostring.hh"
......
src/ltltest/randltl.cc
View file @ 25a31142
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <string> #include <string>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include "ltlast/atomic_prop.hh"
#include "ltlvisit/randomltl.hh" #include "ltlvisit/randomltl.hh"
#include "ltlvisit/tostring.hh" #include "ltlvisit/tostring.hh"
#include "ltlvisit/destroy.hh" #include "ltlvisit/destroy.hh"
......
src/ltltest/readltl.cc
View file @ 25a31142
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include "ltlvisit/dump.hh" #include "ltlvisit/dump.hh"
#include "ltlvisit/dotty.hh" #include "ltlvisit/dotty.hh"
#include "ltlvisit/destroy.hh" #include "ltlvisit/destroy.hh"
#include "ltlast/allnodes.hh"
void void
syntax(char* prog) syntax(char* prog)
......
src/ltltest/reduc.cc
View file @ 25a31142
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "ltlvisit/reduce.hh" #include "ltlvisit/reduce.hh"
#include "ltlvisit/length.hh" #include "ltlvisit/length.hh"
#include "ltlvisit/contain.hh" #include "ltlvisit/contain.hh"
#include "ltlast/allnodes.hh"
void void
syntax(char* prog) syntax(char* prog)
......
src/ltltest/syntimpl.cc
View file @ 25a31142
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "ltlvisit/destroy.hh" #include "ltlvisit/destroy.hh"
#include "ltlvisit/tostring.hh" #include "ltlvisit/tostring.hh"
#include "ltlvisit/syntimpl.hh" #include "ltlvisit/syntimpl.hh"
#include "ltlast/allnodes.hh"
#include "ltlvisit/nenoform.hh" #include "ltlvisit/nenoform.hh"
void void
......