https://swig.svn.sourceforge.net/svnroot/swig/trunk ................ r10487 | wsfulton | 2008-05-21 23:15:52 +0100 (Wed, 21 May 2008) | 1 line Apply patch from Petr Viktorin to fix some recent regressions in CFFI/CLOS ................ r10498 | talby | 2008-05-26 21:09:56 +0100 (Mon, 26 May 2008) | 2 lines run test cases in the Perl set by the --with-perl5 configure option. ................ r10499 | talby | 2008-05-26 22:04:06 +0100 (Mon, 26 May 2008) | 3 lines The perl5 minherit runtime test will work better if the classes are actually built under SWIGPERL. ................ r10503 | wsfulton | 2008-05-28 10:44:37 +0100 (Wed, 28 May 2008) | 1 line Fix variable wrappers when using -proxy. Patch from Jan Jezabek ................ r10504 | bhy | 2008-05-28 18:27:48 +0100 (Wed, 28 May 2008) | 2 lines Fixed SF #1971977: typo in pycontainer.swg (related to -extranative option) ................ r10506 | wsfulton | 2008-05-29 01:45:28 +0100 (Thu, 29 May 2008) | 1 line Fix variable wrappers when using -noproxy ................ r10508 | bhy | 2008-05-30 14:53:33 +0100 (Fri, 30 May 2008) | 1 line Fixed SF #1976978, apply the macros for primitive types to std::wstring ................ r10511 | olly | 2008-05-30 17:11:27 +0100 (Fri, 30 May 2008) | 4 lines Fix typo in handling of /*@SWIG[...]*/ comments in the scanner. This just meant we were only actually looking for /*@SWI at the start of the comment, so was pretty harmless in practice. ................ r10515 | wsfulton | 2008-06-02 21:10:40 +0100 (Mon, 02 Jun 2008) | 1 line Fix samename testcase for c# and java ................ r10516 | wsfulton | 2008-06-02 21:15:39 +0100 (Mon, 02 Jun 2008) | 1 line Fix enums when using -noproxy ................ r10518 | bhy | 2008-06-07 12:20:07 +0100 (Sat, 07 Jun 2008) | 4 lines Added a test case for keyword renaming. Now it works for Python in SWIG's -c++ mode, but in C mode it doesn't work! (you can try with make keyword_rename.ctest) ................ r10519 | bhy | 2008-06-07 14:40:51 +0100 (Sat, 07 Jun 2008) | 1 line fixed keyword_rename.ctest tese case, caused by a mistake in Swig/naming.c ................ r10527 | mgossage | 2008-06-17 03:57:15 +0100 (Tue, 17 Jun 2008) | 1 line [lua] bugfix 1938142 (bool& and bool* support) ................ r10530 | wsfulton | 2008-06-19 21:02:13 +0100 (Thu, 19 Jun 2008) | 1 line Add R keyword support. Rename keywords for successful compilation of Java and C# code. More consistent keyword warnings across the different languages. ................ r10531 | wsfulton | 2008-06-19 22:15:48 +0100 (Thu, 19 Jun 2008) | 1 line add complete list of R reserved words ................ r10536 | wsfulton | 2008-06-21 12:35:33 +0100 (Sat, 21 Jun 2008) | 1 line better terminology for static types ................ r10537 | wsfulton | 2008-06-21 12:42:48 +0100 (Sat, 21 Jun 2008) | 1 line remove raise as keyword test- it conflicts with _raise in LIBCMT on windows ................ r10539 | wsfulton | 2008-06-21 16:21:29 +0100 (Sat, 21 Jun 2008) | 1 line Lua example warning removal fixes for vc++ ................ r10540 | wsfulton | 2008-06-21 16:23:02 +0100 (Sat, 21 Jun 2008) | 1 line Remove some vc++ /W4 warnings ................ r10541 | wsfulton | 2008-06-21 17:04:55 +0100 (Sat, 21 Jun 2008) | 1 line minor vc++ /W4 warning fixes ................ r10542 | wsfulton | 2008-06-21 20:07:51 +0100 (Sat, 21 Jun 2008) | 1 line 'byte' is already used in Ruby on windows, so use another keyword ................ r10543 | wsfulton | 2008-06-21 21:45:32 +0100 (Sat, 21 Jun 2008) | 1 line Fix crashing in the Ruby reject method in the STL wrappers ................ r10544 | wsfulton | 2008-06-21 21:48:28 +0100 (Sat, 21 Jun 2008) | 1 line Fix crashing in the Ruby reject method in the STL wrappers ................ r10545 | wsfulton | 2008-06-21 21:49:10 +0100 (Sat, 21 Jun 2008) | 1 line remove unnecessary variable int the char **STRING_ARRAY out typemap ................ r10546 | wsfulton | 2008-06-21 22:07:49 +0100 (Sat, 21 Jun 2008) | 1 line Fix Ruby C++ example dependencies in dsp files ................ r10547 | wsfulton | 2008-06-21 23:25:36 +0100 (Sat, 21 Jun 2008) | 1 line Fix unused parameter warnings in python when using gcc's -W -Wall options ................ r10548 | wsfulton | 2008-06-21 23:26:35 +0100 (Sat, 21 Jun 2008) | 1 line Fix virtual destructor ................ r10549 | wsfulton | 2008-06-22 00:25:20 +0100 (Sun, 22 Jun 2008) | 1 line various warning fixes ................ r10550 | wsfulton | 2008-06-22 01:09:11 +0100 (Sun, 22 Jun 2008) | 1 line Another fix for the JVM hanging on exit problem when using directors ................ r10551 | wsfulton | 2008-06-22 01:09:51 +0100 (Sun, 22 Jun 2008) | 1 line documentation sections update ................ r10552 | wsfulton | 2008-06-22 01:18:10 +0100 (Sun, 22 Jun 2008) | 1 line more docs on defining macros for the thread hanging problem ................ r10558 | wsfulton | 2008-06-22 22:30:20 +0100 (Sun, 22 Jun 2008) | 1 line fix unused parms in last commit for C code ................ r10559 | wsfulton | 2008-06-22 23:12:43 +0100 (Sun, 22 Jun 2008) | 1 line Suppress unused methods warning for VC++ ................ r10560 | wsfulton | 2008-06-23 21:26:07 +0100 (Mon, 23 Jun 2008) | 1 line fix partialcheck-test-suite and parallel make for r, chicken, tcl and php ................ r10561 | wsfulton | 2008-06-23 21:39:41 +0100 (Mon, 23 Jun 2008) | 1 line correct message display when running the partialcheck-test-suite make target ................ r10562 | wsfulton | 2008-06-23 22:14:53 +0100 (Mon, 23 Jun 2008) | 1 line fix typo ................ r10563 | olly | 2008-06-23 22:23:54 +0100 (Mon, 23 Jun 2008) | 3 lines Fix bad use of Python API (untested, since I can't even compile this code on x86-64!) ................ r10564 | olly | 2008-06-23 23:58:03 +0100 (Mon, 23 Jun 2008) | 3 lines [PHP] Fix segfault when wrapping a non-class function marked with %newobject (testcase char_strings). ................ r10565 | olly | 2008-06-24 01:27:34 +0100 (Tue, 24 Jun 2008) | 3 lines [PHP] Fix assertion failure when handling %typemap(in,numinputs=0) (testcase ignore_parameter). ................ r10566 | olly | 2008-06-24 01:33:08 +0100 (Tue, 24 Jun 2008) | 2 lines [PHP] Fix typemap_namespace.i to not try to copy a non-existent typemap. ................ r10567 | olly | 2008-06-24 01:41:07 +0100 (Tue, 24 Jun 2008) | 3 lines Clean up dead and unused code in SwigToPhpType(), and rename to GetShadowReturnType(). ................ r10568 | olly | 2008-06-24 01:42:29 +0100 (Tue, 24 Jun 2008) | 2 lines Fix cosmetic typo in string constant. ................ r10574 | wsfulton | 2008-06-24 21:10:28 +0100 (Tue, 24 Jun 2008) | 1 line zap last entry ................ r10575 | wsfulton | 2008-06-24 21:11:46 +0100 (Tue, 24 Jun 2008) | 1 line variable name changes to remove php keywords ................ r10576 | wsfulton | 2008-06-24 21:12:08 +0100 (Tue, 24 Jun 2008) | 1 line variable name hiding fix ................ r10577 | wsfulton | 2008-06-24 21:12:43 +0100 (Tue, 24 Jun 2008) | 1 line More info about numobjects added ................ r10578 | wsfulton | 2008-06-24 21:13:41 +0100 (Tue, 24 Jun 2008) | 1 line update for 1.3.36 release ................ r10579 | wsfulton | 2008-06-24 22:48:46 +0100 (Tue, 24 Jun 2008) | 1 line remove deprecated -c commandline option (runtime library generation) ................ r10580 | wsfulton | 2008-06-24 22:53:12 +0100 (Tue, 24 Jun 2008) | 1 line correct comment about deprecated option ................ r10582 | wsfulton | 2008-06-25 00:00:27 +0100 (Wed, 25 Jun 2008) | 1 line use rsync and ssh to upload releases to SourceForge as ftp no longer works ................ r10584 | wsfulton | 2008-06-25 00:24:48 +0100 (Wed, 25 Jun 2008) | 1 line correction for 1.3.36 ................ r10588 | wsfulton | 2008-06-25 01:16:04 +0100 (Wed, 25 Jun 2008) | 1 line section update ................ r10589 | wsfulton | 2008-06-25 01:16:40 +0100 (Wed, 25 Jun 2008) | 1 line bump version to 1.3.37 ................ r10594 | wsfulton | 2008-06-26 19:33:06 +0100 (Thu, 26 Jun 2008) | 1 line correct typo in first entry about %fragment ................ r10607 | wsfulton | 2008-06-29 01:19:05 +0100 (Sun, 29 Jun 2008) | 1 line fix some potential null pointer usage as reported by CoveriCoverity Prevent ................ r10608 | wsfulton | 2008-06-29 01:50:27 +0100 (Sun, 29 Jun 2008) | 1 line fix potential null pointer usage as reported by Coverity Prevent ................ r10609 | wsfulton | 2008-06-29 10:57:41 +0100 (Sun, 29 Jun 2008) | 1 line make life easier for svn status updates as everyone has different autotool versions installed - use svn:ignore on config.sub and config.guess ................ r10610 | wsfulton | 2008-06-29 11:08:14 +0100 (Sun, 29 Jun 2008) | 1 line make life easier for svn status updates as everyone has different autotool versions installed - use svn:ignore on config.sub and config.guess ................ r10616 | talby | 2008-07-01 00:41:27 +0100 (Tue, 01 Jul 2008) | 2 lines Hopefully this provides more portable values for Infinity and NaN in Perl. ................ r10621 | wsfulton | 2008-07-01 23:02:14 +0100 (Tue, 01 Jul 2008) | 1 line update old commandline option ................ r10624 | olly | 2008-07-02 04:17:46 +0100 (Wed, 02 Jul 2008) | 5 lines [Python] Import the C extension differently for Python 2.6 and later so that an implicit relative import doesn't produce a deprecation warning for 2.6 and a failure for 2.7 and later. Patch from Richard Boulton in SF#2008229. ................ r10625 | bhy | 2008-07-02 05:56:11 +0100 (Wed, 02 Jul 2008) | 1 line fix the relative import patch by try both relative and absolute import ................ r10626 | olly | 2008-07-02 06:55:18 +0100 (Wed, 02 Jul 2008) | 4 lines [PHP4] Support for PHP4 has been removed. The PHP developers are no longer making new PHP4 releases, and won't even be patching critical security issues after 2008-08-08. ................ r10627 | bhy | 2008-07-02 07:06:56 +0100 (Wed, 02 Jul 2008) | 1 line fix the previous commit -- new approach using imp module ................ r10628 | bhy | 2008-07-02 07:29:15 +0100 (Wed, 02 Jul 2008) | 1 line minor fix on relative import: close fp if exception occured during imp.find_module ................ r10629 | bhy | 2008-07-02 08:08:00 +0100 (Wed, 02 Jul 2008) | 1 line reconstruct the relative import, now the generated code looks better ................ r10633 | olly | 2008-07-03 01:09:56 +0100 (Thu, 03 Jul 2008) | 9 lines WARN_* constants are user visible, so keep existing WARN_PHP4_* for backward compatibility, but add preferred forms WARN_PHP_* and use these ourselves. Rename Lib/php4 to Lib/php, Source/Modules/php4.cxx to Source/Modules/php.cxx. Add typemaps for const reference so Examples/test-suite/apply_signed_char.i works. ................ r10634 | olly | 2008-07-03 01:12:58 +0100 (Thu, 03 Jul 2008) | 2 lines Remove file added in error. ................ r10635 | olly | 2008-07-03 01:37:38 +0100 (Thu, 03 Jul 2008) | 2 lines Rename php4*.swg to php*.swg. ................ r10636 | olly | 2008-07-03 02:13:51 +0100 (Thu, 03 Jul 2008) | 2 lines Update wrt PHP4. ................ r10637 | olly | 2008-07-03 03:32:11 +0100 (Thu, 03 Jul 2008) | 4 lines [PHP] The deprecated command line option "-phpfull" has been removed. We recommend building your extension as a dynamically loadable module. ................ r10638 | olly | 2008-07-03 03:32:41 +0100 (Thu, 03 Jul 2008) | 2 lines Fix version number ................ r10639 | olly | 2008-07-03 07:04:24 +0100 (Thu, 03 Jul 2008) | 2 lines Make t_output_helper() static. ................ r10640 | olly | 2008-07-03 07:05:34 +0100 (Thu, 03 Jul 2008) | 2 lines Make testcase li_typemaps work for PHP. ................ r10641 | olly | 2008-07-03 10:12:16 +0100 (Thu, 03 Jul 2008) | 2 lines Fix check::classname() to compare case-insensitively and not try to interpolate objects into strings. ................ r10643 | olly | 2008-07-03 23:00:01 +0100 (Thu, 03 Jul 2008) | 4 lines The operator& trick in allowexcept.i doesn't work for SWIG/PHP because the generated code takes the address of the variable in the code in the "vinit" section. So comment out the private operator& for PHP. ................ r10647 | olly | 2008-07-04 00:55:33 +0100 (Fri, 04 Jul 2008) | 2 lines [PHP] The SWIG cdata.i library module is now supported. ................ r10649 | olly | 2008-07-04 02:02:22 +0100 (Fri, 04 Jul 2008) | 4 lines [PHP] The deprecated command line option "-make" has been removed. Searches on Google codesearch suggest that nobody is using it now anyway. ................ r10650 | olly | 2008-07-04 02:22:11 +0100 (Fri, 04 Jul 2008) | 4 lines [PHP] For std_vector.i and std_map.i, rename empty() to is_empty() since "empty" is a PHP reserved word. Based of patch from Mark Klein in SF#1943417. ................ r10662 | wsfulton | 2008-07-14 22:09:23 +0100 (Mon, 14 Jul 2008) | 1 line Fix director typemaps for pointers so that NULL pointers are correctly marshalled to C#/Java null in director methods ................ r10672 | olly | 2008-07-17 02:17:08 +0100 (Thu, 17 Jul 2008) | 2 lines Fix a typo; improve wording. ................ r10676 | wsfulton | 2008-07-17 22:05:49 +0100 (Thu, 17 Jul 2008) | 1 line SF #2019156 Configuring with --without-octave or --without-alllang did not disable octave. ................ r10677 | wsfulton | 2008-07-17 22:08:22 +0100 (Thu, 17 Jul 2008) | 1 line tidy output after detecting X11 headers ................ r10682 | wsfulton | 2008-07-19 19:08:06 +0100 (Sat, 19 Jul 2008) | 1 line a bit more on pgcpp ................ r10683 | wsfulton | 2008-07-19 23:45:54 +0100 (Sat, 19 Jul 2008) | 1 line Fix building of Tcl examples/test-suite on Mac OSX ................ r10714 | olly | 2008-07-27 13:51:16 +0100 (Sun, 27 Jul 2008) | 2 lines Fix "can can" typo in docs (SF#2026756) ................ r10726 | wuzzeb | 2008-08-02 09:28:02 +0100 (Sat, 02 Aug 2008) | 1 line Commit patch 2019314 ................ r10727 | wuzzeb | 2008-08-02 09:49:43 +0100 (Sat, 02 Aug 2008) | 1 line add assert.h to fix chicken build of external runtime (ext_test testsuite) ................ r10738 | talby | 2008-08-07 07:28:13 +0100 (Thu, 07 Aug 2008) | 2 lines hoist globals to local scope where trival. ................ r10743 | talby | 2008-08-08 04:10:55 +0100 (Fri, 08 Aug 2008) | 2 lines initial steps to clean up perl5 class methods (primarily constructors). ................ r10747 | talby | 2008-08-09 05:08:26 +0100 (Sat, 09 Aug 2008) | 2 lines moves perl space constructor fixups into wrapper code. ................ r10749 | talby | 2008-08-10 00:57:55 +0100 (Sun, 10 Aug 2008) | 2 lines usage_func() fix + CHANGES.current entry to explain my past few commits. ................ r10794 | talby | 2008-08-19 08:09:29 +0100 (Tue, 19 Aug 2008) | 3 lines rollback 10737:10749, this work is better left on a branch until it is in support a significant feature enhancement. ................ r10801 | drjoe | 2008-08-31 17:07:43 +0100 (Sun, 31 Aug 2008) | 2 lines change Rf_warning to warning. Looks like a typo ................ r10802 | wsfulton | 2008-09-01 20:59:23 +0100 (Mon, 01 Sep 2008) | 1 line Fix ruby detection problem breaking configure ................ r10803 | wsfulton | 2008-09-01 21:00:28 +0100 (Mon, 01 Sep 2008) | 1 line Fix another perl global namespace pollution ................ r10804 | wsfulton | 2008-09-01 21:32:53 +0100 (Mon, 01 Sep 2008) | 1 line Fix array bounds checking in C# std::vector wrappers ................ r10805 | wsfulton | 2008-09-01 21:34:49 +0100 (Mon, 01 Sep 2008) | 1 line fix runtime problem in Ruby std_vector example ................ r10806 | wsfulton | 2008-09-01 21:42:40 +0100 (Mon, 01 Sep 2008) | 1 line Fix portability problem using /dev/null ................ r10807 | wsfulton | 2008-09-01 22:46:41 +0100 (Mon, 01 Sep 2008) | 1 line patch #2079381 submitted by Boris Smilga - constant exprs put into no-eval context in DEFCENUM ................ r10808 | wsfulton | 2008-09-02 21:56:52 +0100 (Tue, 02 Sep 2008) | 1 line Add new terminator attribute for the csin typemap for C# ................ r10809 | wsfulton | 2008-09-03 00:01:37 +0100 (Wed, 03 Sep 2008) | 1 line Fix #1988296 - Multiple module director linking issue ................ r10827 | richardb | 2008-09-10 11:08:21 +0100 (Wed, 10 Sep 2008) | 6 lines [Python] Commit patch #2089149: Director exception handling mangles returned exception. Exceptions raised by Python code in directors are now passed through to the caller without change. Also, remove the ": " prefix which used to be added to other director exceptions (eg, those due to incorrect return types). ................ r10828 | bhy | 2008-09-10 11:45:33 +0100 (Wed, 10 Sep 2008) | 3 lines Initialized merge tracking via "svnmerge" with revisions "1-10827" from https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-bhy ................ r10829 | bhy | 2008-09-10 12:04:09 +0100 (Wed, 10 Sep 2008) | 4 lines Removed merge tracking for "svnmerge" for https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-bhy (Undo the init due to user error) ................ r10830 | bhy | 2008-09-10 12:08:16 +0100 (Wed, 10 Sep 2008) | 3 lines Initialized merge tracking via "svnmerge" with revisions "1-10403" from https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-bhy ................ r10831 | bhy | 2008-09-10 12:51:12 +0100 (Wed, 10 Sep 2008) | 11 lines (Still trying to set right properity to get svnmerge work...) Recorded merge of revisions 10404 via svnmerge from https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-bhy ........ r10404 | bhy | 2008-05-01 08:35:49 +0800 (Thu, 01 May 2008) | 5 lines Start of gsoc2008-bhy branch. This is a branch for Haoyu Bai's Python 3.0 backend project. Some file already modified since a little of work already done when starting the branch. ........ ................ r10834 | bhy | 2008-09-11 18:18:07 +0100 (Thu, 11 Sep 2008) | 8 lines Merged the Python 3.0 support branch. The merging progress is not so smooth, so hope this commit won't make anything broken. This is the (incomplemete) log produced by svnmerge.py: Merged revisions 10405-10409,10420-10422,10426,10438,10445,10451,10454-10465,10467,10473-10475,10485,10488-10489,10493-10495,10497,10509-10510,10513-10514,10517,10520,10525,10528-10529,10533-10535,10554-10557,10570,10573,10593,10614,10666-10669,10673,10678,10687,10690,10704-10706,10731,10744,10750-10752,10755,10759,10770,10775-10776,10813,10819 via svnmerge from https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-bhy ................ git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-cherylfoil@10837 626c5289-ae23-0410-ae9c-e8d60b6d4f22
393 lines
10 KiB
Text
393 lines
10 KiB
Text
/* -----------------------------------------------------------------------------
|
|
* See the LICENSE file for information on copyright, usage and redistribution
|
|
* of SWIG, and the README file for authors - http://www.swig.org/release.html.
|
|
*
|
|
* pyiterators.swg
|
|
*
|
|
* Implement a python 'output' iterator for Python 2.2 or higher.
|
|
*
|
|
* Users can derive form the PySwigIterator to implement their
|
|
* own iterators. As an example (real one since we use it for STL/STD
|
|
* containers), the template PySwigIterator_T does the
|
|
* implementation for genereic C++ iterators.
|
|
* ----------------------------------------------------------------------------- */
|
|
|
|
%include <std_common.i>
|
|
|
|
%fragment("PySwigIterator","header") {
|
|
namespace swig {
|
|
struct stop_iteration {
|
|
};
|
|
|
|
struct PySwigIterator {
|
|
private:
|
|
PyObject_ptr _seq;
|
|
|
|
protected:
|
|
PySwigIterator(PyObject *seq) : _seq(seq)
|
|
{
|
|
}
|
|
|
|
public:
|
|
virtual ~PySwigIterator() {}
|
|
|
|
// Access iterator method, required by Python
|
|
virtual PyObject *value() const = 0;
|
|
|
|
// Forward iterator method, required by Python
|
|
virtual PySwigIterator *incr(size_t n = 1) = 0;
|
|
|
|
// Backward iterator method, very common in C++, but not required in Python
|
|
virtual PySwigIterator *decr(size_t /*n*/ = 1)
|
|
{
|
|
throw stop_iteration();
|
|
}
|
|
|
|
// Random access iterator methods, but not required in Python
|
|
virtual ptrdiff_t distance(const PySwigIterator &/*x*/) const
|
|
{
|
|
throw std::invalid_argument("operation not supported");
|
|
}
|
|
|
|
virtual bool equal (const PySwigIterator &/*x*/) const
|
|
{
|
|
throw std::invalid_argument("operation not supported");
|
|
}
|
|
|
|
// C++ common/needed methods
|
|
virtual PySwigIterator *copy() const = 0;
|
|
|
|
PyObject *next()
|
|
{
|
|
SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads
|
|
PyObject *obj = value();
|
|
incr();
|
|
SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads
|
|
return obj;
|
|
}
|
|
|
|
/* Make an alias for Python 3.x */
|
|
PyObject *__next__()
|
|
{
|
|
return next();
|
|
}
|
|
|
|
PyObject *previous()
|
|
{
|
|
SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads
|
|
decr();
|
|
PyObject *obj = value();
|
|
SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads
|
|
return obj;
|
|
}
|
|
|
|
PySwigIterator *advance(ptrdiff_t n)
|
|
{
|
|
return (n > 0) ? incr(n) : decr(-n);
|
|
}
|
|
|
|
bool operator == (const PySwigIterator& x) const
|
|
{
|
|
return equal(x);
|
|
}
|
|
|
|
bool operator != (const PySwigIterator& x) const
|
|
{
|
|
return ! operator==(x);
|
|
}
|
|
|
|
PySwigIterator& operator += (ptrdiff_t n)
|
|
{
|
|
return *advance(n);
|
|
}
|
|
|
|
PySwigIterator& operator -= (ptrdiff_t n)
|
|
{
|
|
return *advance(-n);
|
|
}
|
|
|
|
PySwigIterator* operator + (ptrdiff_t n) const
|
|
{
|
|
return copy()->advance(n);
|
|
}
|
|
|
|
PySwigIterator* operator - (ptrdiff_t n) const
|
|
{
|
|
return copy()->advance(-n);
|
|
}
|
|
|
|
ptrdiff_t operator - (const PySwigIterator& x) const
|
|
{
|
|
return x.distance(*this);
|
|
}
|
|
|
|
static swig_type_info* descriptor() {
|
|
static int init = 0;
|
|
static swig_type_info* desc = 0;
|
|
if (!init) {
|
|
desc = SWIG_TypeQuery("swig::PySwigIterator *");
|
|
init = 1;
|
|
}
|
|
return desc;
|
|
}
|
|
};
|
|
}
|
|
}
|
|
|
|
%fragment("PySwigIterator_T","header",fragment="PySwigIterator",fragment="StdTraits",fragment="StdIteratorTraits") {
|
|
namespace swig {
|
|
template<typename OutIterator>
|
|
class PySwigIterator_T : public PySwigIterator
|
|
{
|
|
public:
|
|
typedef OutIterator out_iterator;
|
|
typedef typename std::iterator_traits<out_iterator>::value_type value_type;
|
|
typedef PySwigIterator_T<out_iterator> self_type;
|
|
|
|
PySwigIterator_T(out_iterator curr, PyObject *seq)
|
|
: PySwigIterator(seq), current(curr)
|
|
{
|
|
}
|
|
|
|
const out_iterator& get_current() const
|
|
{
|
|
return current;
|
|
}
|
|
|
|
|
|
bool equal (const PySwigIterator &iter) const
|
|
{
|
|
const self_type *iters = dynamic_cast<const self_type *>(&iter);
|
|
if (iters) {
|
|
return (current == iters->get_current());
|
|
} else {
|
|
throw std::invalid_argument("bad iterator type");
|
|
}
|
|
}
|
|
|
|
ptrdiff_t distance(const PySwigIterator &iter) const
|
|
{
|
|
const self_type *iters = dynamic_cast<const self_type *>(&iter);
|
|
if (iters) {
|
|
return std::distance(current, iters->get_current());
|
|
} else {
|
|
throw std::invalid_argument("bad iterator type");
|
|
}
|
|
}
|
|
|
|
protected:
|
|
out_iterator current;
|
|
};
|
|
|
|
template <class ValueType>
|
|
struct from_oper
|
|
{
|
|
typedef const ValueType& argument_type;
|
|
typedef PyObject *result_type;
|
|
result_type operator()(argument_type v) const
|
|
{
|
|
return swig::from(v);
|
|
}
|
|
};
|
|
|
|
template<typename OutIterator,
|
|
typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
|
|
typename FromOper = from_oper<ValueType> >
|
|
class PySwigIteratorOpen_T : public PySwigIterator_T<OutIterator>
|
|
{
|
|
public:
|
|
FromOper from;
|
|
typedef OutIterator out_iterator;
|
|
typedef ValueType value_type;
|
|
typedef PySwigIterator_T<out_iterator> base;
|
|
typedef PySwigIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
|
|
|
|
PySwigIteratorOpen_T(out_iterator curr, PyObject *seq)
|
|
: PySwigIterator_T<OutIterator>(curr, seq)
|
|
{
|
|
}
|
|
|
|
PyObject *value() const {
|
|
return from(static_cast<const value_type&>(*(base::current)));
|
|
}
|
|
|
|
PySwigIterator *copy() const
|
|
{
|
|
return new self_type(*this);
|
|
}
|
|
|
|
PySwigIterator *incr(size_t n = 1)
|
|
{
|
|
while (n--) {
|
|
++base::current;
|
|
}
|
|
return this;
|
|
}
|
|
|
|
PySwigIterator *decr(size_t n = 1)
|
|
{
|
|
while (n--) {
|
|
--base::current;
|
|
}
|
|
return this;
|
|
}
|
|
};
|
|
|
|
template<typename OutIterator,
|
|
typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
|
|
typename FromOper = from_oper<ValueType> >
|
|
class PySwigIteratorClosed_T : public PySwigIterator_T<OutIterator>
|
|
{
|
|
public:
|
|
FromOper from;
|
|
typedef OutIterator out_iterator;
|
|
typedef ValueType value_type;
|
|
typedef PySwigIterator_T<out_iterator> base;
|
|
typedef PySwigIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
|
|
|
|
PySwigIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq)
|
|
: PySwigIterator_T<OutIterator>(curr, seq), begin(first), end(last)
|
|
{
|
|
}
|
|
|
|
PyObject *value() const {
|
|
if (base::current == end) {
|
|
throw stop_iteration();
|
|
} else {
|
|
return from(static_cast<const value_type&>(*(base::current)));
|
|
}
|
|
}
|
|
|
|
PySwigIterator *copy() const
|
|
{
|
|
return new self_type(*this);
|
|
}
|
|
|
|
PySwigIterator *incr(size_t n = 1)
|
|
{
|
|
while (n--) {
|
|
if (base::current == end) {
|
|
throw stop_iteration();
|
|
} else {
|
|
++base::current;
|
|
}
|
|
}
|
|
return this;
|
|
}
|
|
|
|
PySwigIterator *decr(size_t n = 1)
|
|
{
|
|
while (n--) {
|
|
if (base::current == begin) {
|
|
throw stop_iteration();
|
|
} else {
|
|
--base::current;
|
|
}
|
|
}
|
|
return this;
|
|
}
|
|
|
|
private:
|
|
out_iterator begin;
|
|
out_iterator end;
|
|
};
|
|
|
|
template<typename OutIter>
|
|
inline PySwigIterator*
|
|
make_output_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, PyObject *seq = 0)
|
|
{
|
|
return new PySwigIteratorClosed_T<OutIter>(current, begin, end, seq);
|
|
}
|
|
|
|
template<typename OutIter>
|
|
inline PySwigIterator*
|
|
make_output_iterator(const OutIter& current, PyObject *seq = 0)
|
|
{
|
|
return new PySwigIteratorOpen_T<OutIter>(current, seq);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
%fragment("PySwigIterator");
|
|
namespace swig
|
|
{
|
|
/*
|
|
Throw a StopIteration exception
|
|
*/
|
|
%ignore stop_iteration;
|
|
struct stop_iteration {};
|
|
|
|
%typemap(throws) stop_iteration {
|
|
(void)$1;
|
|
SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
|
|
SWIG_fail;
|
|
}
|
|
|
|
/*
|
|
Mark methods that return new objects
|
|
*/
|
|
%newobject PySwigIterator::copy;
|
|
%newobject PySwigIterator::operator + (ptrdiff_t n) const;
|
|
%newobject PySwigIterator::operator - (ptrdiff_t n) const;
|
|
|
|
%nodirector PySwigIterator;
|
|
%extend PySwigIterator {
|
|
%pythoncode {def __iter__(self): return self}
|
|
}
|
|
|
|
%catches(swig::stop_iteration) PySwigIterator::value() const;
|
|
%catches(swig::stop_iteration) PySwigIterator::incr(size_t n = 1);
|
|
%catches(swig::stop_iteration) PySwigIterator::decr(size_t n = 1);
|
|
%catches(std::invalid_argument) PySwigIterator::distance(const PySwigIterator &x) const;
|
|
%catches(std::invalid_argument) PySwigIterator::equal (const PySwigIterator &x) const;
|
|
%catches(swig::stop_iteration) PySwigIterator::__next__();
|
|
%catches(swig::stop_iteration) PySwigIterator::next();
|
|
%catches(swig::stop_iteration) PySwigIterator::previous();
|
|
%catches(swig::stop_iteration) PySwigIterator::advance(ptrdiff_t n);
|
|
%catches(swig::stop_iteration) PySwigIterator::operator += (ptrdiff_t n);
|
|
%catches(swig::stop_iteration) PySwigIterator::operator -= (ptrdiff_t n);
|
|
%catches(swig::stop_iteration) PySwigIterator::operator + (ptrdiff_t n) const;
|
|
%catches(swig::stop_iteration) PySwigIterator::operator - (ptrdiff_t n) const;
|
|
|
|
|
|
struct PySwigIterator
|
|
{
|
|
protected:
|
|
PySwigIterator(PyObject *seq);
|
|
|
|
public:
|
|
virtual ~PySwigIterator();
|
|
|
|
// Access iterator method, required by Python
|
|
virtual PyObject *value() const = 0;
|
|
|
|
// Forward iterator method, required by Python
|
|
virtual PySwigIterator *incr(size_t n = 1) = 0;
|
|
|
|
// Backward iterator method, very common in C++, but not required in Python
|
|
virtual PySwigIterator *decr(size_t n = 1);
|
|
|
|
// Random access iterator methods, but not required in Python
|
|
virtual ptrdiff_t distance(const PySwigIterator &x) const;
|
|
|
|
virtual bool equal (const PySwigIterator &x) const;
|
|
|
|
// C++ common/needed methods
|
|
virtual PySwigIterator *copy() const = 0;
|
|
|
|
PyObject *next();
|
|
PyObject *__next__();
|
|
PyObject *previous();
|
|
PySwigIterator *advance(ptrdiff_t n);
|
|
|
|
bool operator == (const PySwigIterator& x) const;
|
|
bool operator != (const PySwigIterator& x) const;
|
|
PySwigIterator& operator += (ptrdiff_t n);
|
|
PySwigIterator& operator -= (ptrdiff_t n);
|
|
PySwigIterator* operator + (ptrdiff_t n) const;
|
|
PySwigIterator* operator - (ptrdiff_t n) const;
|
|
ptrdiff_t operator - (const PySwigIterator& x) const;
|
|
};
|
|
}
|
|
|