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

defaultenv: simplify usage

Browse source 
* src/ltlenv/defaultenv.hh, src/ltlenv/defaultenv.cc (require): Return
an atomic_prop*, not a formula*.
* src/bin/randaut.cc, src/bin/randltl.cc, src/ltlvisit/apcollect.cc,
src/tgbatest/ltl2tgba.cc, src/tgbatest/randtgba.cc: Do not cast
the return of require().
This commit is contained in:
Alexandre Duret-Lutz 2014-11-30 19:53:14 +01:00
parent e6e416e1e1
commit 4f1535c8fe
7 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bin/randaut.cc
View file

@ -31,7 +31,6 @@
#include "common_range.hh"
#include "common_cout.hh"
#include "ltlast/atomic_prop.hh"
#include "ltlenv/defaultenv.hh"
#include "misc/random.hh"
@ -242,8 +241,7 @@ parse_opt(int key, char* arg, struct argp_state* as)
break;
}
}
aprops.insert(static_cast<const spot::ltl::atomic_prop*>
(spot::ltl::default_environment::instance().require(arg)));
aprops.insert(spot::ltl::default_environment::instance().require(arg));
break;
default:

6
src/bin/randltl.cc
View file

@ -32,7 +32,6 @@
#include "common_r.hh"
#include <sstream>
#include "ltlast/atomic_prop.hh"
#include "ltlast/multop.hh"
#include "ltlast/unop.hh"
#include "ltlvisit/randomltl.hh"
@ -156,7 +155,7 @@ remove_some_props(spot::ltl::atomic_prop_set& s)
while (n--)
{
spot::ltl::atomic_prop_set::iterator i = s.begin();
auto i = s.begin();
std::advance(i, spot::mrand(s.size()));
s.erase(i);
}
@ -260,8 +259,7 @@ parse_opt(int key, char* arg, struct argp_state* as)
break;
}
}
aprops.insert(static_cast<const spot::ltl::atomic_prop*>
(spot::ltl::default_environment::instance().require(arg)));
aprops.insert(spot::ltl::default_environment::instance().require(arg));
break;
default:
return ARGP_ERR_UNKNOWN;