Parse the fusion operator (":") and translate it in ltl2tgba_fm().
* src/ltlast/multop.hh (multop::type::Fusion): New operator. * src/ltlast/multop.cc: Handle it. * src/ltlparse/ltlparse.yy: Declare OP_FUSION and add grammar rules. * src/ltlparse/ltlscan.ll: Recognize ":" as OP_FUSION. * src/tgbaalgos/ltl2tgba_fm.cc (ratexp_trad_visitor::visit): Add translation rule for multop::Fusion. * src/tgbatest/ltl2tgba.test: Add more tests. * src/ltlvisit/basicreduce.cc, src/ltlvisit/consterm.cc, src/ltlvisit/contain.cc, src/ltlvisit/mark.cc, src/ltlvisit/nenoform.cc, src/ltlvisit/syntimpl.cc, src/ltlvisit/tostring.cc, src/tgba/formula2bdd.cc, src/tgbaalgos/eltl2tgba_lacim.cc, src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2tgba_lacim.cc: Handle multop::Fusion in switches.
This commit is contained in:
parent
ad519b8568
commit
c2b3dac7aa
17 changed files with 146 additions and 25 deletions
|
|
@ -787,6 +787,7 @@ namespace spot
|
|||
|
||||
break;
|
||||
case multop::Concat:
|
||||
case multop::Fusion:
|
||||
std::copy(res->begin(), res->end(), tmpOther->end());
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -97,6 +97,13 @@ namespace spot
|
|||
void
|
||||
visit(const multop* mo)
|
||||
{
|
||||
// The fusion operator cannot be used to recognize the empty word.
|
||||
if (mo->op() == multop::Fusion)
|
||||
{
|
||||
result_ = false;
|
||||
return;
|
||||
}
|
||||
|
||||
unsigned max = mo->size();
|
||||
// This sets the initial value of result_.
|
||||
mo->nth(0)->accept(*this);
|
||||
|
|
@ -118,6 +125,10 @@ namespace spot
|
|||
if (!result_)
|
||||
return;
|
||||
break;
|
||||
case multop::Fusion:
|
||||
/* Unreachable code */
|
||||
assert(0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -356,6 +356,7 @@ namespace spot
|
|||
}
|
||||
break;
|
||||
case multop::Concat:
|
||||
case multop::Fusion:
|
||||
break;
|
||||
}
|
||||
if (changed)
|
||||
|
|
|
|||
|
|
@ -166,6 +166,7 @@ namespace spot
|
|||
{
|
||||
case multop::Or:
|
||||
case multop::Concat:
|
||||
case multop::Fusion:
|
||||
for (unsigned i = 0; i < mos; ++i)
|
||||
res->push_back(recurse(mo->nth(i)));
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -226,23 +226,30 @@ namespace spot
|
|||
op = multop::And;
|
||||
break;
|
||||
case multop::Concat:
|
||||
case multop::Fusion:
|
||||
break;
|
||||
}
|
||||
multop::vec* res = new multop::vec;
|
||||
unsigned mos = mo->size();
|
||||
if (op != multop::Concat)
|
||||
switch (op)
|
||||
{
|
||||
for (unsigned i = 0; i < mos; ++i)
|
||||
res->push_back(recurse(mo->nth(i)));
|
||||
result_ = multop::instance(op, res);
|
||||
}
|
||||
else
|
||||
{
|
||||
for (unsigned i = 0; i < mos; ++i)
|
||||
res->push_back(recurse_(mo->nth(i), false));
|
||||
result_ = multop::instance(op, res);
|
||||
if (negated_)
|
||||
result_ = unop::instance(unop::Not, result_);
|
||||
case multop::And:
|
||||
case multop::Or:
|
||||
{
|
||||
for (unsigned i = 0; i < mos; ++i)
|
||||
res->push_back(recurse(mo->nth(i)));
|
||||
result_ = multop::instance(op, res);
|
||||
break;
|
||||
}
|
||||
case multop::Concat:
|
||||
case multop::Fusion:
|
||||
{
|
||||
for (unsigned i = 0; i < mos; ++i)
|
||||
res->push_back(recurse_(mo->nth(i), false));
|
||||
result_ = multop::instance(op, res);
|
||||
if (negated_)
|
||||
result_ = unop::instance(unop::Not, result_);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -203,6 +203,7 @@ namespace spot
|
|||
result_ = true;
|
||||
break;
|
||||
case multop::Concat:
|
||||
case multop::Fusion:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -458,6 +459,7 @@ namespace spot
|
|||
result_ = true;
|
||||
break;
|
||||
case multop::Concat:
|
||||
case multop::Fusion:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -259,6 +259,9 @@ namespace spot
|
|||
case multop::Concat:
|
||||
ch = ";";
|
||||
break;
|
||||
case multop::Fusion:
|
||||
ch = ":";
|
||||
break;
|
||||
}
|
||||
|
||||
for (unsigned n = 1; n < max; ++n)
|
||||
|
|
@ -460,6 +463,9 @@ namespace spot
|
|||
case multop::Concat:
|
||||
ch = ";";
|
||||
break;
|
||||
case multop::Fusion:
|
||||
ch = ":";
|
||||
break;
|
||||
}
|
||||
|
||||
for (unsigned n = 1; n < max; ++n)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue