kill the ltl namespace
* NEWS: Mention it. * bench/stutter/stutter_invariance_formulas.cc, bench/stutter/stutter_invariance_randomgraph.cc, doc/mainpage.dox, doc/org/tut01.org, doc/org/tut02.org, doc/org/tut10.org, doc/tl/tl.tex, iface/ltsmin/ltsmin.cc, iface/ltsmin/ltsmin.hh, iface/ltsmin/modelcheck.cc, src/bin/autfilt.cc, src/bin/common_aoutput.cc, src/bin/common_aoutput.hh, src/bin/common_finput.cc, src/bin/common_finput.hh, src/bin/common_output.cc, src/bin/common_output.hh, src/bin/common_r.hh, src/bin/common_trans.cc, src/bin/common_trans.hh, src/bin/dstar2tgba.cc, src/bin/genltl.cc, src/bin/ltl2tgba.cc, src/bin/ltl2tgta.cc, src/bin/ltlcross.cc, src/bin/ltldo.cc, src/bin/ltlfilt.cc, src/bin/ltlgrind.cc, src/bin/randaut.cc, src/bin/randltl.cc, src/kripke/kripkeexplicit.cc, src/kripke/kripkeexplicit.hh, src/kripkeparse/kripkeparse.yy, src/kripkeparse/public.hh, src/ltlparse/fmterror.cc, src/ltlparse/ltlparse.yy, src/ltlparse/ltlscan.ll, src/ltlparse/parsedecl.hh, src/ltlparse/public.hh, src/parseaut/parseaut.yy, src/parseaut/public.hh, src/tests/checkpsl.cc, src/tests/checkta.cc, src/tests/complementation.cc, src/tests/consterm.cc, src/tests/emptchk.cc, src/tests/equalsf.cc, src/tests/ikwiad.cc, src/tests/kind.cc, src/tests/length.cc, src/tests/ltlprod.cc, src/tests/ltlrel.cc, src/tests/parse.test, src/tests/parse_print_test.cc, src/tests/randtgba.cc, src/tests/readltl.cc, src/tests/reduc.cc, src/tests/syntimpl.cc, src/tests/taatgba.cc, src/tests/tostring.cc, src/tests/tostring.test, src/tl/apcollect.cc, src/tl/apcollect.hh, src/tl/contain.cc, src/tl/contain.hh, src/tl/declenv.cc, src/tl/declenv.hh, src/tl/defaultenv.cc, src/tl/defaultenv.hh, src/tl/dot.cc, src/tl/dot.hh, src/tl/environment.hh, src/tl/exclusive.cc, src/tl/exclusive.hh, src/tl/formula.cc, src/tl/formula.hh, src/tl/length.cc, src/tl/length.hh, src/tl/mark.cc, src/tl/mark.hh, src/tl/mutation.cc, src/tl/mutation.hh, src/tl/nenoform.cc, src/tl/nenoform.hh, src/tl/print.cc, src/tl/print.hh, src/tl/randomltl.cc, src/tl/randomltl.hh, src/tl/relabel.cc, src/tl/relabel.hh, src/tl/remove_x.cc, src/tl/remove_x.hh, src/tl/simpfg.cc, src/tl/simpfg.hh, src/tl/simplify.cc, src/tl/simplify.hh, src/tl/snf.cc, src/tl/snf.hh, src/tl/unabbrev.cc, src/tl/unabbrev.hh, src/twa/bdddict.cc, src/twa/bdddict.hh, src/twa/bddprint.cc, src/twa/formula2bdd.cc, src/twa/formula2bdd.hh, src/twa/taatgba.cc, src/twa/taatgba.hh, src/twa/twa.hh, src/twa/twagraph.cc, src/twa/twagraph.hh, src/twaalgos/compsusp.cc, src/twaalgos/compsusp.hh, src/twaalgos/ltl2taa.cc, src/twaalgos/ltl2taa.hh, src/twaalgos/ltl2tgba_fm.cc, src/twaalgos/ltl2tgba_fm.hh, src/twaalgos/minimize.cc, src/twaalgos/minimize.hh, src/twaalgos/neverclaim.cc, src/twaalgos/postproc.cc, src/twaalgos/postproc.hh, src/twaalgos/powerset.cc, src/twaalgos/powerset.hh, src/twaalgos/randomgraph.cc, src/twaalgos/randomgraph.hh, src/twaalgos/relabel.cc, src/twaalgos/relabel.hh, src/twaalgos/remprop.cc, src/twaalgos/remprop.hh, src/twaalgos/stats.cc, src/twaalgos/stats.hh, src/twaalgos/stutter.cc, src/twaalgos/stutter.hh, src/twaalgos/translate.cc, src/twaalgos/translate.hh, wrap/python/spot_impl.i: Remove the ltl namespace.
This commit is contained in:
Alexandre Duret-Lutz
parent
6ded5e75c4
commit
cb39210166
137 changed files with 10771 additions and 10919 deletions
|
|
@ -95,7 +95,7 @@ namespace spot
|
|||
}
|
||||
|
||||
int
|
||||
bdd_dict::register_proposition(ltl::formula f, const void* for_me)
|
||||
bdd_dict::register_proposition(formula f, const void* for_me)
|
||||
{
|
||||
int num;
|
||||
// Do not build a variable that already exists.
|
||||
|
|
@ -117,7 +117,7 @@ namespace spot
|
|||
}
|
||||
|
||||
int
|
||||
bdd_dict::has_registered_proposition(ltl::formula f,
|
||||
bdd_dict::has_registered_proposition(formula f,
|
||||
const void* me)
|
||||
{
|
||||
auto ssi = var_map.find(f);
|
||||
|
|
@ -131,7 +131,7 @@ namespace spot
|
|||
}
|
||||
|
||||
int
|
||||
bdd_dict::register_acceptance_variable(ltl::formula f,
|
||||
bdd_dict::register_acceptance_variable(formula f,
|
||||
const void* for_me)
|
||||
{
|
||||
int num;
|
||||
|
|
@ -171,7 +171,7 @@ namespace spot
|
|||
register_acceptance_variables(bdd_low(f), for_me);
|
||||
}
|
||||
|
||||
ltl::formula
|
||||
formula
|
||||
bdd_dict::oneacc_to_formula(int var) const
|
||||
{
|
||||
assert(unsigned(var) < bdd_map.size());
|
||||
|
|
@ -180,7 +180,7 @@ namespace spot
|
|||
return i.f;
|
||||
}
|
||||
|
||||
ltl::formula
|
||||
formula
|
||||
bdd_dict::oneacc_to_formula(bdd oneacc) const
|
||||
{
|
||||
assert(oneacc != bddfalse);
|
||||
|
|
@ -274,7 +274,7 @@ namespace spot
|
|||
// Let's free it. First, we need to find
|
||||
// if this is a Var or an Acc variable.
|
||||
int n = 1;
|
||||
ltl::formula f = nullptr;
|
||||
formula f = nullptr;
|
||||
switch (bdd_map[v].type)
|
||||
{
|
||||
case var:
|
||||
|
|
|
|||
|
|
@ -66,9 +66,9 @@ namespace spot
|
|||
~bdd_dict();
|
||||
|
||||
/// Formula-to-BDD-variable maps.
|
||||
typedef std::map<ltl::formula, int> fv_map;
|
||||
typedef std::map<formula, int> fv_map;
|
||||
/// BDD-variable-to-formula maps.
|
||||
typedef std::map<int, ltl::formula> vf_map;
|
||||
typedef std::map<int, formula> vf_map;
|
||||
|
||||
fv_map var_map; ///< Maps atomic propositions to BDD variables
|
||||
fv_map acc_map; ///< Maps acceptance conditions to BDD variables
|
||||
|
|
@ -80,7 +80,7 @@ namespace spot
|
|||
struct bdd_info {
|
||||
bdd_info() : type(anon) {}
|
||||
var_type type;
|
||||
ltl::formula f; // Used unless t==anon.
|
||||
formula f; // Used unless t==anon.
|
||||
ref_set refs;
|
||||
int clone_counts;
|
||||
};
|
||||
|
|
@ -99,10 +99,10 @@ namespace spot
|
|||
/// \return The variable number. Use bdd_ithvar() or bdd_nithvar()
|
||||
/// to convert this to a BDD.
|
||||
/// @{
|
||||
int register_proposition(ltl::formula f, const void* for_me);
|
||||
int register_proposition(formula f, const void* for_me);
|
||||
|
||||
template <typename T>
|
||||
int register_proposition(ltl::formula f, std::shared_ptr<T> for_me)
|
||||
int register_proposition(formula f, std::shared_ptr<T> for_me)
|
||||
{
|
||||
return register_proposition(f, for_me.get());
|
||||
}
|
||||
|
|
@ -114,10 +114,10 @@ namespace spot
|
|||
/// a non-negative value that is the BDD variable number.
|
||||
/// Otherwise this returns -1.
|
||||
/// @{
|
||||
int has_registered_proposition(ltl::formula f, const void* me);
|
||||
int has_registered_proposition(formula f, const void* me);
|
||||
|
||||
template <typename T>
|
||||
int has_registered_proposition(ltl::formula f, std::shared_ptr<T> for_me)
|
||||
int has_registered_proposition(formula f, std::shared_ptr<T> for_me)
|
||||
{
|
||||
return has_registered_proposition(f, for_me.get());
|
||||
}
|
||||
|
|
@ -134,10 +134,10 @@ namespace spot
|
|||
/// \return The variable number. Use bdd_ithvar() or bdd_nithvar()
|
||||
/// to convert this to a BDD.
|
||||
/// @{
|
||||
int register_acceptance_variable(ltl::formula f, const void* for_me);
|
||||
int register_acceptance_variable(formula f, const void* for_me);
|
||||
|
||||
template <typename T>
|
||||
int register_acceptance_variable(ltl::formula f, std::shared_ptr<T> for_me)
|
||||
int register_acceptance_variable(formula f, std::shared_ptr<T> for_me)
|
||||
{
|
||||
return register_acceptance_variable(f, for_me.get());
|
||||
}
|
||||
|
|
@ -169,7 +169,7 @@ namespace spot
|
|||
///
|
||||
/// The returned formula is not cloned, and is valid until the BDD
|
||||
/// variable used in \a oneacc are unregistered.
|
||||
ltl::formula oneacc_to_formula(bdd oneacc) const;
|
||||
formula oneacc_to_formula(bdd oneacc) const;
|
||||
|
||||
/// \brief Convert one acceptance condition into the associated
|
||||
/// formula.
|
||||
|
|
@ -179,7 +179,7 @@ namespace spot
|
|||
///
|
||||
/// The returned formula is not cloned, and is valid until the BDD
|
||||
/// variable \a var is unregistered.
|
||||
ltl::formula oneacc_to_formula(int var) const;
|
||||
formula oneacc_to_formula(int var) const;
|
||||
|
||||
/// \brief Register anonymous BDD variables.
|
||||
///
|
||||
|
|
|
|||
|
|
@ -40,12 +40,12 @@ namespace spot
|
|||
static bool utf8;
|
||||
|
||||
static
|
||||
std::ostream& print_(std::ostream& o, ltl::formula f)
|
||||
std::ostream& print_(std::ostream& o, formula f)
|
||||
{
|
||||
if (utf8)
|
||||
ltl::print_utf8_psl(o, f);
|
||||
print_utf8_psl(o, f);
|
||||
else
|
||||
ltl::print_psl(o, f);
|
||||
print_psl(o, f);
|
||||
return o;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,6 @@
|
|||
|
||||
namespace spot
|
||||
{
|
||||
using namespace ltl;
|
||||
|
||||
namespace
|
||||
{
|
||||
// Convert a BDD which is known to be a conjonction into a formula.
|
||||
|
|
@ -111,16 +109,16 @@ namespace spot
|
|||
case op::And:
|
||||
case op::Or:
|
||||
{
|
||||
int op = bddop_and;
|
||||
int o = bddop_and;
|
||||
bdd res = bddtrue;
|
||||
if (f.is(ltl::op::Or))
|
||||
if (f.is(op::Or))
|
||||
{
|
||||
op = bddop_or;
|
||||
o = bddop_or;
|
||||
res = bddfalse;
|
||||
}
|
||||
unsigned s = f.size();
|
||||
for (unsigned n = 0; n < s; ++n)
|
||||
res = bdd_apply(res, recurse(f[n]), op);
|
||||
res = bdd_apply(res, recurse(f[n]), o);
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,11 +39,11 @@ namespace spot
|
|||
/// for_me. See bdd_dict::unregister_all_my_variables().
|
||||
/// @{
|
||||
SPOT_API bdd
|
||||
formula_to_bdd(ltl::formula f, const bdd_dict_ptr& d, void* for_me);
|
||||
formula_to_bdd(formula f, const bdd_dict_ptr& d, void* for_me);
|
||||
|
||||
template<typename T>
|
||||
SPOT_API bdd
|
||||
formula_to_bdd(ltl::formula f, const bdd_dict_ptr& d,
|
||||
formula_to_bdd(formula f, const bdd_dict_ptr& d,
|
||||
const std::shared_ptr<T>& for_me)
|
||||
{
|
||||
return formula_to_bdd(f, d, for_me.get());
|
||||
|
|
@ -57,7 +57,7 @@ namespace spot
|
|||
/// into their atomic propositions. This works only for Boolean
|
||||
/// formulas, and all the BDD variables used in \a f should have
|
||||
/// been registered in \a d. Although the result has type
|
||||
/// ltl::formula, it obviously does not use any temporal operator.
|
||||
/// formula, it obviously does not use any temporal operator.
|
||||
SPOT_API
|
||||
ltl::formula bdd_to_formula(bdd f, const bdd_dict_ptr d);
|
||||
formula bdd_to_formula(bdd f, const bdd_dict_ptr d);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ namespace spot
|
|||
}
|
||||
|
||||
void
|
||||
taa_tgba::add_condition(transition* t, ltl::formula f)
|
||||
taa_tgba::add_condition(transition* t, formula f)
|
||||
{
|
||||
t->condition &= formula_to_bdd(f, get_dict(), this);
|
||||
}
|
||||
|
|
@ -324,6 +324,6 @@ namespace spot
|
|||
std::string
|
||||
taa_tgba_formula::label_to_string(const label_t& label) const
|
||||
{
|
||||
return ltl::str_psl(label);
|
||||
return str_psl(label);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ namespace spot
|
|||
const state_set* dst;
|
||||
};
|
||||
|
||||
void add_condition(transition* t, ltl::formula f);
|
||||
void add_condition(transition* t, formula f);
|
||||
|
||||
/// TGBA interface.
|
||||
virtual ~taa_tgba();
|
||||
|
|
@ -66,7 +66,7 @@ namespace spot
|
|||
taa_tgba::state_set* init_;
|
||||
ss_vec state_set_vec_;
|
||||
|
||||
std::map<ltl::formula, acc_cond::mark_t> acc_map_;
|
||||
std::map<formula, acc_cond::mark_t> acc_map_;
|
||||
|
||||
private:
|
||||
// Disallow copy.
|
||||
|
|
@ -192,7 +192,7 @@ namespace spot
|
|||
return create_transition(s, vec);
|
||||
}
|
||||
|
||||
void add_acceptance_condition(transition* t, ltl::formula f)
|
||||
void add_acceptance_condition(transition* t, formula f)
|
||||
{
|
||||
auto p = acc_map_.emplace(f, 0);
|
||||
if (p.second)
|
||||
|
|
@ -326,14 +326,14 @@ namespace spot
|
|||
|
||||
class SPOT_API taa_tgba_formula final:
|
||||
#ifndef SWIG
|
||||
public taa_tgba_labelled<ltl::formula>
|
||||
public taa_tgba_labelled<formula>
|
||||
#else
|
||||
public taa_tgba
|
||||
#endif
|
||||
{
|
||||
public:
|
||||
taa_tgba_formula(const bdd_dict_ptr& dict) :
|
||||
taa_tgba_labelled<ltl::formula>(dict) {}
|
||||
taa_tgba_labelled<formula>(dict) {}
|
||||
~taa_tgba_formula()
|
||||
{}
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -595,7 +595,7 @@ namespace spot
|
|||
/// \brief Register an atomic proposition designated by formula \a ap.
|
||||
///
|
||||
/// \return The BDD variable number.
|
||||
int register_ap(ltl::formula ap)
|
||||
int register_ap(formula ap)
|
||||
{
|
||||
aps_.push_back(ap);
|
||||
int res = dict_->register_proposition(ap, this);
|
||||
|
|
@ -608,12 +608,12 @@ namespace spot
|
|||
/// \return The BDD variable number.
|
||||
int register_ap(std::string name)
|
||||
{
|
||||
return register_ap(ltl::formula::ap(name));
|
||||
return register_ap(formula::ap(name));
|
||||
}
|
||||
|
||||
/// \brief Get the vector of atomic propositions used by this
|
||||
/// automaton.
|
||||
const std::vector<ltl::formula>& ap() const
|
||||
const std::vector<formula>& ap() const
|
||||
{
|
||||
return aps_;
|
||||
}
|
||||
|
|
@ -745,7 +745,7 @@ namespace spot
|
|||
mutable const state* last_support_conditions_input_;
|
||||
private:
|
||||
mutable bdd last_support_conditions_output_;
|
||||
std::vector<ltl::formula> aps_;
|
||||
std::vector<formula> aps_;
|
||||
bdd bddaps_;
|
||||
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
namespace spot
|
||||
{
|
||||
void
|
||||
twa_graph::release_formula_namer(namer<ltl::formula>* namer,
|
||||
twa_graph::release_formula_namer(namer<formula>* namer,
|
||||
bool keep_names)
|
||||
{
|
||||
if (keep_names)
|
||||
|
|
|
|||
|
|
@ -219,14 +219,14 @@ namespace spot
|
|||
return new named_graph<graph_t, State_Name, Name_Hash, Name_Equal>(g_);
|
||||
}
|
||||
|
||||
namer<ltl::formula>*
|
||||
namer<formula>*
|
||||
create_formula_namer()
|
||||
{
|
||||
return create_namer<ltl::formula>();
|
||||
return create_namer<formula>();
|
||||
}
|
||||
|
||||
void
|
||||
release_formula_namer(namer<ltl::formula>* namer, bool keep_names);
|
||||
release_formula_namer(namer<formula>* namer, bool keep_names);
|
||||
#endif
|
||||
|
||||
graph_t& get_graph()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue