546260e7a0
This bitfield is easily updated as the formulae are constructed. Doing so avoids many AST recursions to compute these properties individually. This patch removes the eventual_universal_visitor, as well as the kind_of() function. * src/ltlast/formula.hh (is_boolean, is_sugar_free_boolean, is_in_nenoform, is_X_free, is_sugar_free_ltl, is_ltl_formula, is_eltl_formula, is_psl_formula, is_eventual, is_universal, is_marked): New methods to query formula properties in constant time. (get_props, ltl_prop): A method and structure for implementation as a field bit in an unsigned, for fast computation. (print_formula_props): New function. * src/ltlast/formula.cc (print_formula_props): Implement it. * src/ltlast/atomic_prop.cc, src/ltlast/binop.cc, src/ltlast/bunop.cc, src/ltlast/constant.cc, src/ltlast/multop.cc, src/ltlast/unop.cc, src/ltlast/automatop.cc: Compute the properties as instances are constructed. * src/ltlparse/ltlparse.yy: Update to use is_boolean() instead of kind_of(). * src/ltltest/kind.cc: Update to use print_formula_props(). * src/ltltest/kind.test: Adjust to test eventual and universal properties. * src/ltlvisit/kind.cc, src/ltlvisit/kind.hh: Delete these files. * src/ltlvisit/Makefile.am: Remove kind.hh and kind.cc. * src/ltlvisit/reduce.cc (recurse_eu, eventual_universal_visitor): Remove, no longer needed. (reduce_visitor, is_eventual, is_universal): Adjust to use formula::is_eventual(), and formula::is_universal(). * src/ltlvisit/reduce.hh (is_eventual, is_universal): Declare as deprecated.
125 lines
3.1 KiB
C++
125 lines
3.1 KiB
C++
// Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement
|
|
// de l'Epita (LRDE).
|
|
// Copyright (C) 2003, 2004, 2005 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.
|
|
|
|
#include "atomic_prop.hh"
|
|
#include "visitor.hh"
|
|
#include <cassert>
|
|
#include <ostream>
|
|
|
|
namespace spot
|
|
{
|
|
namespace ltl
|
|
{
|
|
|
|
atomic_prop::atomic_prop(const std::string& name, environment& env)
|
|
: name_(name), env_(&env)
|
|
{
|
|
is.boolean = true;
|
|
is.sugar_free_boolean = true;
|
|
is.in_nenoform = true;
|
|
is.X_free = true;
|
|
is.sugar_free_ltl = true;
|
|
is.ltl_formula = true;
|
|
is.eltl_formula = true;
|
|
is.psl_formula = true;
|
|
is.eventual = false;
|
|
is.universal = false;
|
|
is.not_marked = true;
|
|
}
|
|
|
|
atomic_prop::~atomic_prop()
|
|
{
|
|
// Get this instance out of the instance map.
|
|
pair p(name(), &env());
|
|
map::iterator i = instances.find(p);
|
|
assert (i != instances.end());
|
|
instances.erase(i);
|
|
}
|
|
|
|
std::string
|
|
atomic_prop::dump() const
|
|
{
|
|
return "AP(" + name() + ")";
|
|
}
|
|
|
|
void
|
|
atomic_prop::accept(visitor& v)
|
|
{
|
|
v.visit(this);
|
|
}
|
|
|
|
void
|
|
atomic_prop::accept(const_visitor& v) const
|
|
{
|
|
v.visit(this);
|
|
}
|
|
|
|
const std::string&
|
|
atomic_prop::name() const
|
|
{
|
|
return name_;
|
|
}
|
|
|
|
environment&
|
|
atomic_prop::env() const
|
|
{
|
|
return *env_;
|
|
}
|
|
|
|
atomic_prop::map atomic_prop::instances;
|
|
|
|
atomic_prop*
|
|
atomic_prop::instance(const std::string& name, environment& env)
|
|
{
|
|
pair p(name, &env);
|
|
map::iterator i = instances.find(p);
|
|
if (i != instances.end())
|
|
{
|
|
return static_cast<atomic_prop*>(i->second->clone());
|
|
}
|
|
atomic_prop* ap = new atomic_prop(name, env);
|
|
instances[p] = ap;
|
|
return static_cast<atomic_prop*>(ap->clone());
|
|
}
|
|
|
|
unsigned
|
|
atomic_prop::instance_count()
|
|
{
|
|
return instances.size();
|
|
}
|
|
|
|
std::ostream&
|
|
atomic_prop::dump_instances(std::ostream& os)
|
|
{
|
|
|
|
for (map::iterator i = instances.begin(); i != instances.end(); ++i)
|
|
{
|
|
os << i->second << " = " << i->second->ref_count_()
|
|
<< " * atomic_prop(" << i->first.first << ", "
|
|
<< i->first.second->name() << ")" << std::endl;
|
|
}
|
|
return os;
|
|
}
|
|
|
|
}
|
|
}
|