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

formula: rename the constants for consistency

Browse source 
False/True are problematic in Python, and I don't like that the
enum is op::False but the constructor formula::ff().  So let's
just use ff and tt everywhere, and also eword instead of EmptyWord.

* src/ltlast/formula.hh (False, True, EmptyWord, AP, is_false, is_true):
Rename to...
(ff, tt, eword, ap, is_ff, is_tt): ... these.
* iface/ltsmin/ltsmin.cc, src/ltlast/formula.cc,
src/ltlvisit/apcollect.cc, src/ltlvisit/dot.cc, src/ltlvisit/mark.cc,
src/ltlvisit/mutation.cc, src/ltlvisit/print.cc,
src/ltlvisit/relabel.cc, src/ltlvisit/simpfg.cc,
src/ltlvisit/simplify.cc, src/ltlvisit/snf.cc, src/ltlvisit/unabbrev.cc,
src/twa/acc.cc, src/twa/acc.hh, src/twa/formula2bdd.cc,
src/twaalgos/gtec/gtec.cc, src/twaalgos/hoa.cc, src/twaalgos/ltl2taa.cc,
src/twaalgos/ltl2tgba_fm.cc, src/twaalgos/neverclaim.cc,
src/twaalgos/product.cc, src/twaalgos/remfin.cc, src/twaalgos/safety.cc,
src/tests/parseerr.test, src/tests/utf8.test, wrap/python/spot.py:
Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2015-09-27 22:47:17 +02:00
parent fad05632a2
commit 8b4ec5ded0
27 changed files with 211 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/ltlast/formula.hh
View file

@ -41,10 +41,10 @@ namespace spot
{
enum class op: uint8_t
{
False,
True,
EmptyWord,
AP,
ff,
tt,
eword,
ap,
// unary operators
Not,
X,
@ -210,9 +210,9 @@ namespace spot
return ff_;
}
bool is_false() const
bool is_ff() const
{
return op_ == op::False;
return op_ == op::ff;
}
static const fnode* tt()
@ -220,9 +220,9 @@ namespace spot
return tt_;
}
bool is_true() const
bool is_tt() const
{
return op_ == op::True;
return op_ == op::tt;
}
static const fnode* eword()
@ -232,12 +232,12 @@ namespace spot
bool is_eword() const
{
return op_ == op::EmptyWord;
return op_ == op::eword;
}
bool is_constant() const
{
return op_ == op::False || op_ == op::True || op_ == op::EmptyWord;
return op_ == op::ff || op_ == op::tt || op_ == op::eword;
}
bool is_Kleene_star() const
@ -579,7 +579,7 @@ namespace spot
{
if (f->is(op::Not))
f = f->nth(0);
if (f->is(op::AP))
if (f->is(op::ap))
return f;
return nullptr;
};
@ -1088,9 +1088,9 @@ namespace spot
return formula(fnode::ff());
}
bool is_false() const
bool is_ff() const
{
return ptr_->is_false();
return ptr_->is_ff();
}
static formula tt()
@ -1098,9 +1098,9 @@ namespace spot
return formula(fnode::tt());
}
bool is_true() const
bool is_tt() const
{
return ptr_->is_true();
return ptr_->is_tt();
}
static formula eword()
@ -1130,7 +1130,7 @@ namespace spot
bool is_literal()
{
return (is(op::AP) ||
return (is(op::ap) ||
// If f is in nenoform, Not can only occur in front of
// an atomic proposition. So this way we do not have
// to check the type of the child.
@ -1194,10 +1194,10 @@ namespace spot
{
switch (op o = kind())
{
case op::False:
case op::True:
case op::EmptyWord:
case op::AP:
case op::ff:
case op::tt:
case op::eword:
case op::ap:
return *this;
case op::Not:
case op::X: