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

18
src/tgbaalgos/lbtt.cc
View file

@ -135,11 +135,10 @@ namespace spot
tgba_digraph_ptr
lbtt_read_tgba(unsigned num_states, unsigned num_acc,
std::istream& is, std::string& error,
const bdd_dict_ptr& dict,
ltl::environment& env, ltl::environment& envacc)
const bdd_dict_ptr& dict, ltl::environment& env)
{
auto aut = make_tgba_digraph(dict);
acc_mapper_int acc_b(aut, num_acc, envacc);
acc_mapper_int acc_b(aut, num_acc);
aut->new_states(num_states);
for (unsigned n = 0; n < num_states; ++n)
@ -200,11 +199,10 @@ namespace spot
tgba_digraph_ptr
lbtt_read_gba(unsigned num_states, unsigned num_acc,
std::istream& is, std::string& error,
const bdd_dict_ptr& dict,
ltl::environment& env, ltl::environment& envacc)
const bdd_dict_ptr& dict, ltl::environment& env)
{
auto aut = make_tgba_digraph(dict);
acc_mapper_int acc_b(aut, num_acc, envacc);
acc_mapper_int acc_b(aut, num_acc);
aut->new_states(num_states);
aut->prop_state_based_acc();
@ -277,7 +275,7 @@ namespace spot
tgba_digraph_ptr
lbtt_parse(std::istream& is, std::string& error, const bdd_dict_ptr& dict,
ltl::environment& env, ltl::environment& envacc)
ltl::environment& env)
{
is >> std::skipws;
@ -306,10 +304,8 @@ namespace spot
type = is.get();
if (type == 't' || type == 'T')
return lbtt_read_tgba(num_states, num_acc, is, error, dict,
env, envacc);
return lbtt_read_tgba(num_states, num_acc, is, error, dict, env);
else
return lbtt_read_gba(num_states, num_acc, is, error, dict,
env, envacc);
return lbtt_read_gba(num_states, num_acc, is, error, dict, env);
}
}

3
src/tgbaalgos/lbtt.hh
View file

@ -54,8 +54,7 @@ namespace spot
SPOT_API tgba_digraph_ptr
lbtt_parse(std::istream& is, std::string& error,
const bdd_dict_ptr& dict,
ltl::environment& env = ltl::default_environment::instance(),
ltl::environment& envacc = ltl::default_environment::instance());
ltl::environment& env = ltl::default_environment::instance());
}
#endif // SPOT_TGBAALGOS_LBTT_HH