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

Do not assume that concatenation cannot accept the empty word.

Browse source 
For instance "(a+#e);(b+#e);(c*)" does.

* src/ltlvisit/consterm.cc: Fix handling of Concat operator.
* src/ltltest/consterm.test: Add more tests.
This commit is contained in:
Alexandre Duret-Lutz 2010-03-02 12:44:46 +01:00
parent bd9136a98e
commit ad519b8568
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ltltest/consterm.test
View file

@ -37,3 +37,6 @@ run 1 ../consterm '((a ; b) + #e)'
run 0 ../consterm '((a ; b) + #e) & e' run 0 ../consterm '((a ; b) + #e) & e'
run 1 ../consterm '((a ; b) + #e) & #e' run 1 ../consterm '((a ; b) + #e) & #e'
run 1 ../consterm '((a ; b) + #e) & (a* + b)' run 1 ../consterm '((a ; b) + #e) & (a* + b)'
run 1 ../consterm '(a + #e);(b + #e);(c + #e)'
run 0 ../consterm '(a + #e);(b + e);(c + #e)'
run 1 ../consterm '(a + #e);(b + e)*;(c + #e)'

10
src/ltlvisit/consterm.cc
View file

@ -97,12 +97,6 @@ namespace spot
void void
visit(const multop* mo) visit(const multop* mo)
{ {
if (mo->op() == multop::Concat)
{
result_ = false;
return;
}
unsigned max = mo->size(); unsigned max = mo->size();
// This sets the initial value of result_. // This sets the initial value of result_.
mo->nth(0)->accept(*this); mo->nth(0)->accept(*this);
@ -119,13 +113,11 @@ namespace spot
return; return;
break; break;
case multop::And: case multop::And:
case multop::Concat:
result_ &= r; result_ &= r;
if (!result_) if (!result_)
return; return;
break; break;
case multop::Concat:
assert(!"unreachable code");
break;
} }
} }
} }