546559b8c3
Trivial simplifications rules (such as "FFa=Fa" or "x&1=x") are performed any time a formule is instanciated. * src/ltlast/constant.hh, src/ltlast/constant.cc (true_instance, true_instance_): Declare the true_instance_ as a static member, and move true_instance() into the .hh so it gets inlined. Have true_instance_ as a class variable will ensure that it is the first formula instantiated. Binop simplifications rely on this to order arguments. (false_instance, false_instance_): Likewise. (empty_word_instance, empty_word_instance_): New method and static member. * src/ltlast/formula.hh (formula::formula): If max_count_ ever loops, skip the first three values so that constants always have smaller hash codes. * src/ltlast/binop.hh, src/ltlast/binop.cc (instance): Add simplifications and document them. * src/ltlast/multop.hh (multop::Concat): New operator. * src/ltlast/multop.cc (op_name): Handle Concat. (instance): Inline Concat arguments without reordering. Handle absorbent and neutral elements for all operators. * src/ltlast/unop.hh (unop::Star): New operator. * src/ltlast/unop.cc (op_name): Handle Star. (instance): Handle Star, and add trivial simplifications for other unary operators. * src/ltlparse/ltlparse.yy (OP_CONCAT, OP_STAR, CONST_EMPTYWORD): Declare these new operators and add rules for them. * src/ltlparse/ltlscan.ll (OP_CONCAT, OP_STAR, CONST_EMPTYWORD): Output these new operators. * src/ltltest/equals.test: New tests. * src/ltltest/parse.test: Remove redundant test. * src/ltltest/tunabbrev.test, src/tgbatest/emptchk.test: Adjust tests. * src/ltlvisit/basicreduce.cc, src/ltlvisit/contain.cc, src/ltlvisit/nenoform.cc, src/ltlvisit/reduce.cc, src/ltlvisit/syntimpl.cc, src/ltlvisit/tostring.cc, src/ltlvisit/tunabbrev.cc: Complete visitors to handle new operators. * src/ltltest/nenoform.test: More tests. * src/ltlvisit/lunabbrev.cc (unabbreviate_logic_visitor::visit): Clone formulae before instance() function actually have a chance to destroy them. * src/tgba/formula2bdd.cc, src/tgbaalgos/eltl2tgba_lacim.cc, src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/ltl2tgba_lacim.cc: Adjust switches to assert on new operators.
74 lines
2.3 KiB
C++
74 lines
2.3 KiB
C++
// Copyright (C) 2009, 2010 Laboratoire de Recherche et D<>veloppement
|
||
// de l'Epita (LRDE).
|
||
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||
//
|
||
// 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"
|
||
|
||
namespace spot
|
||
{
|
||
namespace ltl
|
||
{
|
||
|
||
/// \brief A constant (True or False)
|
||
/// \ingroup ltl_ast
|
||
class constant : public formula
|
||
{
|
||
public:
|
||
enum type { False, True, EmptyWord };
|
||
virtual void accept(visitor& v);
|
||
virtual void accept(const_visitor& v) const;
|
||
|
||
/// Return the value of the constant.
|
||
type val() const;
|
||
/// Return the value of the constant as a string.
|
||
const char* val_name() const;
|
||
|
||
virtual std::string dump() const;
|
||
|
||
/// Get the sole instance of spot::ltl::constant::constant(True).
|
||
static constant* true_instance() { return &true_instance_; }
|
||
/// Get the sole instance of spot::ltl::constant::constant(False).
|
||
static constant* false_instance() { return &false_instance_; }
|
||
/// Get the sole instance of spot::ltl::constant::constant(EmptyWord).
|
||
static constant* empty_word_instance() { return &empty_word_instance_; }
|
||
|
||
protected:
|
||
constant(type val);
|
||
virtual ~constant();
|
||
|
||
private:
|
||
type val_;
|
||
|
||
static constant true_instance_;
|
||
static constant false_instance_;
|
||
static constant empty_word_instance_;
|
||
// If you add new constants here, be sure to update the
|
||
// formula::formula() constructor.
|
||
};
|
||
|
||
}
|
||
}
|
||
|
||
#endif // SPOT_LTLAST_CONSTANT_HH
|