Simplify {b && {r1:...:rn}} as {b && r1 && ... && rn}.
* src/ltlvisit/simplify.cc (simplify_visitor): Do it. * src/ltltest/reduccmp.test: Add a test. * doc/tl/tl.tex: Document it. * src/ltlast/multop.cc: Fix the computation of is.accepting_eword for Fusion. The Fusion operator never accepts [*0].
This commit is contained in:
parent
77084747b9
commit
d0cfd44ba6
4 changed files with 28 additions and 2 deletions
|
|
@ -43,8 +43,9 @@ namespace spot
|
|||
|
||||
switch (op)
|
||||
{
|
||||
case Concat:
|
||||
case Fusion:
|
||||
is.accepting_eword = false;
|
||||
case Concat:
|
||||
case AndNLM:
|
||||
// Note: AndNLM(p1,p2) is a Boolean formula, but it is
|
||||
// actually rewritten as And(p1,p2) by trivial identities
|
||||
|
|
|
|||
|
|
@ -210,6 +210,7 @@ for x in ../reduccmp ../reductaustr; do
|
|||
run 0 $x '{a && b && d[=2]} <>-> d' '0'
|
||||
run 0 $x '{a && b && d[->2..4]} <>-> d' '0'
|
||||
run 0 $x '{a && b && d[*2..]} <>-> d' '0'
|
||||
run 0 $x '{a && { c* : b* : (g|h)*}} <>-> d' 'a & c & b & (g | h) & d'
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
|
|||
|
|
@ -1944,7 +1944,28 @@ namespace spot
|
|||
*i = 0;
|
||||
break;
|
||||
}
|
||||
case formula::MultOp:
|
||||
{
|
||||
multop* r = down_cast<multop*>(*i);
|
||||
switch (r->op())
|
||||
{
|
||||
case multop::Fusion:
|
||||
{
|
||||
//b && {r1:..:rn} = b && r1 && .. && rn
|
||||
unsigned rs = r->size();
|
||||
for (unsigned j = 0; j < rs; ++j)
|
||||
ares->push_back(r->nth(j)->clone());
|
||||
r->destroy();
|
||||
*i = 0;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
goto common;
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
common:
|
||||
ares->push_back(*i);
|
||||
*i = 0;
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue