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

python: make it possible to modify edges during iteration

Browse source 
Reported by Laurent Xu.

* python/spot/impl.i: Fix the iterator to return pointers instead of
references.  Because references are ultimately copied.
* tests/python/automata.ipynb: Add test cases.
* NEWS: Mention it.
This commit is contained in:
Alexandre Duret-Lutz 2016-07-29 16:09:54 +02:00
parent 09c6393942
commit d271dfd592
3 changed files with 215 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

10
python/spot/impl.i
View file

@ -163,14 +163,16 @@ using namespace spot;
%}
// Swig come with iterators that implement a decrement method.
// This is not supported in our "successor" iterators.
// Swig come with iterators that implement a decrement method. This
// is not supported in our "successor" iterators. Also we want
// iterators to return pointers so that data can be modified during
// iteration.
%fragment("ForwardIterator_T","header",fragment="SwigPyIterator_T") {
namespace swig
{
template<typename OutIterator,
typename ValueType =
typename std::iterator_traits<OutIterator>::value_type,
typename std::iterator_traits<OutIterator>::pointer,
typename FromOper = from_oper<ValueType> >
class ForwardIterator_T : public SwigPyIterator_T<OutIterator>
{
@ -191,7 +193,7 @@ namespace swig
if (base::current == end) {
throw stop_iteration();
} else {
return from(static_cast<const value_type&>(*(base::current)));
return from(static_cast<value_type>(&*(base::current)));
}
}