* iface/gspn/common.cc, iface/gspn/common.hh: Remove the

class gspn_environment, and move it to ...
* src/ltlenv/declenv.cc, src/ltlenv/declenv.hh: .. this new file
as class declarative_environment.
* src/ltlenv/Makefile.am (ltlenv_HEADERS): Add declenv.hh.
(libltlenv_la_SOURCES): Add declenv.cc.
* iface/gspn/dottygspn.cc, iface/gspn/dottyssp.cc,
iface/gspn/gspn.cc, iface/gspn/gspn.hh, iface/gspn/ltlgspn.cc,
iface/gspn/ssp.cc, iface/gspn/ssp.hh: Adjust references
to declarative_environment.
This commit is contained in:
Alexandre Duret-Lutz 2004-06-02 16:21:49 +00:00
parent 8e324fa2a2
commit 383f7e170a
13 changed files with 184 additions and 102 deletions

View file

@ -1,4 +1,4 @@
// Copyright (C) 2003 Laboratoire d'Informatique de Paris 6 (LIP6),
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie.
//
@ -32,50 +32,4 @@ namespace spot
return os;
}
// gspn_environment
//////////////////////////////////////////////////////////////////////
gspn_environment::gspn_environment()
{
}
gspn_environment::~gspn_environment()
{
for (prop_map::iterator i = props_.begin(); i != props_.end(); ++i)
ltl::destroy(i->second);
}
bool
gspn_environment::declare(const std::string& prop_str)
{
if (props_.find(prop_str) != props_.end())
return false;
props_[prop_str] = ltl::atomic_prop::instance(prop_str, *this);
return true;
}
ltl::formula*
gspn_environment::require(const std::string& prop_str)
{
prop_map::iterator i = props_.find(prop_str);
if (i == props_.end())
return 0;
// It's an atomic_prop, so we do not have to use the clone() visitor.
return i->second->ref();
}
/// Get the name of the environment.
const std::string&
gspn_environment::name()
{
static std::string name("gspn environment");
return name;
}
const gspn_environment::prop_map&
gspn_environment::get_prop_map() const
{
return props_;
}
}