alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tgbaparse, lbttparse: do not pass an environment for acceptance sets

Browse source 
* src/priv/accmap.hh, src/tgbaalgos/lbtt.cc, src/tgbaalgos/lbtt.hh,
src/tgbaparse/public.hh, src/tgbaparse/tgbaparse.yy,
src/tgbatest/ltl2tgba.cc, src/tgbatest/tgbaread.cc: Do not pass any
environment parameter to parse acceptance sets.  This is not used
anymore since we moved to int-labeled acceptance sets.
This commit is contained in:
Alexandre Duret-Lutz 2014-12-10 15:10:28 +01:00
parent be57ec290a
commit e4158c21ee
7 changed files with 22 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/priv/accmap.hh
View file

@ -23,7 +23,6 @@
#include <bddx.h>
#include "misc/hash.hh"
#include "ltlast/formula.hh"
#include "ltlenv/defaultenv.hh"
#include "tgba/tgbagraph.hh"
namespace spot
@ -33,18 +32,11 @@ namespace spot
protected:
bdd_dict_ptr dict_;
tgba_digraph_ptr aut_;
ltl::environment& env_;
acc_mapper_common(const tgba_digraph_ptr& aut, ltl::environment& env)
: dict_(aut->get_dict()), aut_(aut), env_(env)
acc_mapper_common(const tgba_digraph_ptr& aut)
: dict_(aut->get_dict()), aut_(aut)
{
}
public:
const ltl::environment& get_env() const
{
return env_;
}
};
class acc_mapper_string: public acc_mapper_common
@ -52,10 +44,8 @@ namespace spot
std::unordered_map<std::string, unsigned> map_;
public:
acc_mapper_string(const tgba_digraph_ptr& aut,
ltl::environment& env
= ltl::default_environment::instance())
: acc_mapper_common(aut, env)
acc_mapper_string(const tgba_digraph_ptr& aut)
: acc_mapper_common(aut)
{
}
@ -84,11 +74,8 @@ namespace spot
class acc_mapper_consecutive_int: public acc_mapper_common
{
public:
acc_mapper_consecutive_int(const tgba_digraph_ptr& aut,
unsigned count,
ltl::environment& env =
ltl::default_environment::instance())
: acc_mapper_common(aut, env)
acc_mapper_consecutive_int(const tgba_digraph_ptr& aut, unsigned count)
: acc_mapper_common(aut)
{
std::vector<unsigned> vmap(count);
aut->acc().add_sets(count);
@ -111,11 +98,8 @@ namespace spot
std::map<unsigned, acc_cond::mark_t> map_;
public:
acc_mapper_int(const tgba_digraph_ptr& aut,
unsigned count,
ltl::environment& env =
ltl::default_environment::instance())
: acc_mapper_consecutive_int(aut, count, env), used_(0)
acc_mapper_int(const tgba_digraph_ptr& aut, unsigned count)
: acc_mapper_consecutive_int(aut, count), used_(0)
{
}