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

Add a has_lbt_atomic_props() method to LTL formulas.

Browse source 
* src/ltlast/formula.hh (has_lbt_atomic_props): New method.
* src/ltlast/formula.cc (printprops): Display it.
* src/ltlast/atomic_prop.cc: Update it.
* src/bin/ltlcheck.cc, src/bin/genltl.cc: Use it.
* doc/tl/tl.tex: Menton has_lbt_atomic_props().
This commit is contained in:
Alexandre Duret-Lutz 2012-10-14 15:52:53 +02:00
parent f40925f67b
commit b2de0136b2
6 changed files with 46 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/ltlast/atomic_prop.cc
View file

@ -52,6 +52,15 @@ namespace spot
is.syntactic_persistence = true;
is.not_marked = true;
is.accepting_eword = false;
// is.lbt_atomic_props should be true if the name has the form
// pNN where NN is any number of digit.
std::string::const_iterator pos = name.begin();
is.lbt_atomic_props = (pos != name.end() && *pos++ == 'p');
while (is.lbt_atomic_props && pos != name.end())
{
char l = *pos++;
is.lbt_atomic_props = (l >= '0' && l <= '9');
}
}
atomic_prop::~atomic_prop()

3
src/ltlast/formula.cc
View file

@ -81,7 +81,8 @@ namespace spot
proprint(is_syntactic_persistence, "p", "syntactic persistence"); \
proprint(is_syntactic_recurrence, "r", "syntactic recurrence"); \
proprint(is_marked, "+", "marked"); \
proprint(accepts_eword, "0", "accepts the empty word");
proprint(accepts_eword, "0", "accepts the empty word"); \
proprint(has_lbt_atomic_props, "l", "as LBT-style atomic props");
std::list<std::string>

6
src/ltlast/formula.hh
View file

@ -275,6 +275,11 @@ namespace spot
return is.accepting_eword;
}
bool has_lbt_atomic_props() const
{
return is.lbt_atomic_props;
}
/// The properties as a field of bits. For internal use.
unsigned get_props() const
{
@ -333,6 +338,7 @@ namespace spot
bool syntactic_persistence:1; // Syntactic Persistence Property.
bool not_marked:1; // No occurrence of EConcatMarked.
bool accepting_eword:1; // Accepts the empty word.
bool lbt_atomic_props:1; // Use only atomic propositions like p42.
};
union
{