defaultenv: simplify usage

* 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

View file

@ -20,7 +20,6 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "ltlast/atomic_prop.hh"
#include "defaultenv.hh"
namespace spot
@ -32,7 +31,7 @@ namespace spot
{
}
const formula*
const atomic_prop*
default_environment::require(const std::string& s)
{
return atomic_prop::instance(s, *this);

View file

@ -24,6 +24,7 @@
# define SPOT_LTLENV_DEFAULTENV_HH
# include "environment.hh"
# include "ltlast/atomic_prop.hh"
namespace spot
{
@ -41,7 +42,7 @@ namespace spot
{
public:
virtual ~default_environment();
virtual const formula* require(const std::string& prop_str);
virtual const atomic_prop* require(const std::string& prop_str);
virtual const std::string& name() const;
/// Get the sole instance of spot::ltl::default_environment.