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
675 lines
18 KiB
C
675 lines
18 KiB
C
/* -----------------------------------------------------------------------------
|
|
* 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.
|
|
*
|
|
* templ.c
|
|
*
|
|
* Expands a template into a specialized version.
|
|
* ----------------------------------------------------------------------------- */
|
|
|
|
char cvsroot_templ_c[] = "$Id$";
|
|
|
|
#include "swig.h"
|
|
#include "cparse.h"
|
|
|
|
static int template_debug = 0;
|
|
|
|
|
|
String *baselists[3];
|
|
|
|
void SwigType_template_init() {
|
|
baselists[0] = "baselist";
|
|
baselists[1] = "protectedbaselist";
|
|
baselists[2] = "privatebaselist";
|
|
}
|
|
|
|
|
|
static void add_parms(ParmList *p, List *patchlist, List *typelist) {
|
|
while (p) {
|
|
SwigType *ty = Getattr(p, "type");
|
|
SwigType *val = Getattr(p, "value");
|
|
Append(typelist, ty);
|
|
Append(typelist, val);
|
|
Append(patchlist, val);
|
|
p = nextSibling(p);
|
|
}
|
|
}
|
|
|
|
void Swig_cparse_debug_templates(int x) {
|
|
template_debug = x;
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* cparse_template_expand()
|
|
*
|
|
* Expands a template node into a specialized version. This is done by
|
|
* patching typenames and other aspects of the node according to a list of
|
|
* template parameters
|
|
* ----------------------------------------------------------------------------- */
|
|
|
|
static int cparse_template_expand(Node *n, String *tname, String *rname, String *templateargs, List *patchlist, List *typelist, List *cpatchlist) {
|
|
static int expanded = 0;
|
|
int ret;
|
|
String *nodeType;
|
|
if (!n)
|
|
return 0;
|
|
nodeType = nodeType(n);
|
|
if (Getattr(n, "error"))
|
|
return 0;
|
|
|
|
if (Equal(nodeType, "template")) {
|
|
/* Change the node type back to normal */
|
|
if (!expanded) {
|
|
expanded = 1;
|
|
set_nodeType(n, Getattr(n, "templatetype"));
|
|
ret = cparse_template_expand(n, tname, rname, templateargs, patchlist, typelist, cpatchlist);
|
|
expanded = 0;
|
|
return ret;
|
|
} else {
|
|
/* Called when template appears inside another template */
|
|
/* Member templates */
|
|
|
|
set_nodeType(n, Getattr(n, "templatetype"));
|
|
ret = cparse_template_expand(n, tname, rname, templateargs, patchlist, typelist, cpatchlist);
|
|
set_nodeType(n, "template");
|
|
return ret;
|
|
}
|
|
} else if (Equal(nodeType, "cdecl")) {
|
|
/* A simple C declaration */
|
|
SwigType *t, *v, *d;
|
|
String *code;
|
|
t = Getattr(n, "type");
|
|
v = Getattr(n, "value");
|
|
d = Getattr(n, "decl");
|
|
|
|
code = Getattr(n, "code");
|
|
|
|
Append(typelist, t);
|
|
Append(typelist, d);
|
|
Append(patchlist, v);
|
|
Append(cpatchlist, code);
|
|
|
|
if (Getattr(n, "conversion_operator")) {
|
|
Append(cpatchlist, Getattr(n, "name"));
|
|
if (Getattr(n, "sym:name")) {
|
|
Append(cpatchlist, Getattr(n, "sym:name"));
|
|
}
|
|
}
|
|
|
|
add_parms(Getattr(n, "parms"), cpatchlist, typelist);
|
|
add_parms(Getattr(n, "throws"), cpatchlist, typelist);
|
|
|
|
} else if (Equal(nodeType, "class")) {
|
|
/* Patch base classes */
|
|
{
|
|
int b = 0;
|
|
for (b = 0; b < 3; ++b) {
|
|
List *bases = Getattr(n, baselists[b]);
|
|
if (bases) {
|
|
int i;
|
|
int ilen = Len(bases);
|
|
for (i = 0; i < ilen; i++) {
|
|
String *name = Copy(Getitem(bases, i));
|
|
Setitem(bases, i, name);
|
|
Append(typelist, name);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
/* Patch children */
|
|
{
|
|
Node *cn = firstChild(n);
|
|
while (cn) {
|
|
cparse_template_expand(cn, tname, rname, templateargs, patchlist, typelist, cpatchlist);
|
|
cn = nextSibling(cn);
|
|
}
|
|
}
|
|
} else if (Equal(nodeType, "constructor")) {
|
|
String *name = Getattr(n, "name");
|
|
if (!(Getattr(n, "templatetype"))) {
|
|
String *symname;
|
|
String *stripped_name = SwigType_templateprefix(name);
|
|
if (Strstr(tname, stripped_name)) {
|
|
Replaceid(name, stripped_name, tname);
|
|
}
|
|
Delete(stripped_name);
|
|
symname = Getattr(n, "sym:name");
|
|
if (symname) {
|
|
stripped_name = SwigType_templateprefix(symname);
|
|
if (Strstr(tname, stripped_name)) {
|
|
Replaceid(symname, stripped_name, tname);
|
|
}
|
|
Delete(stripped_name);
|
|
}
|
|
if (strchr(Char(name), '<')) {
|
|
Append(patchlist, Getattr(n, "name"));
|
|
} else {
|
|
Append(name, templateargs);
|
|
}
|
|
name = Getattr(n, "sym:name");
|
|
if (name) {
|
|
if (strchr(Char(name), '<')) {
|
|
Clear(name);
|
|
Append(name, rname);
|
|
} else {
|
|
String *tmp = Copy(name);
|
|
Replace(tmp, tname, rname, DOH_REPLACE_ANY);
|
|
Clear(name);
|
|
Append(name, tmp);
|
|
Delete(tmp);
|
|
}
|
|
}
|
|
/* Setattr(n,"sym:name",name); */
|
|
}
|
|
Append(cpatchlist, Getattr(n, "code"));
|
|
Append(typelist, Getattr(n, "decl"));
|
|
add_parms(Getattr(n, "parms"), cpatchlist, typelist);
|
|
add_parms(Getattr(n, "throws"), cpatchlist, typelist);
|
|
} else if (Equal(nodeType, "destructor")) {
|
|
String *name = Getattr(n, "name");
|
|
if (name) {
|
|
if (strchr(Char(name), '<'))
|
|
Append(patchlist, Getattr(n, "name"));
|
|
else
|
|
Append(name, templateargs);
|
|
}
|
|
name = Getattr(n, "sym:name");
|
|
if (name) {
|
|
if (strchr(Char(name), '<')) {
|
|
String *sn = Copy(tname);
|
|
Setattr(n, "sym:name", sn);
|
|
Delete(sn);
|
|
} else {
|
|
Replace(name, tname, rname, DOH_REPLACE_ANY);
|
|
}
|
|
}
|
|
/* Setattr(n,"sym:name",name); */
|
|
Append(cpatchlist, Getattr(n, "code"));
|
|
} else if (Equal(nodeType, "using")) {
|
|
String *uname = Getattr(n, "uname");
|
|
if (uname && strchr(Char(uname), '<')) {
|
|
Append(patchlist, uname);
|
|
}
|
|
if (Getattr(n, "namespace")) {
|
|
/* Namespace link. This is nasty. Is other namespace defined? */
|
|
|
|
}
|
|
} else {
|
|
/* Look for obvious parameters */
|
|
Node *cn;
|
|
Append(cpatchlist, Getattr(n, "code"));
|
|
Append(typelist, Getattr(n, "type"));
|
|
Append(typelist, Getattr(n, "decl"));
|
|
add_parms(Getattr(n, "parms"), cpatchlist, typelist);
|
|
add_parms(Getattr(n, "kwargs"), cpatchlist, typelist);
|
|
add_parms(Getattr(n, "pattern"), cpatchlist, typelist);
|
|
add_parms(Getattr(n, "throws"), cpatchlist, typelist);
|
|
cn = firstChild(n);
|
|
while (cn) {
|
|
cparse_template_expand(cn, tname, rname, templateargs, patchlist, typelist, cpatchlist);
|
|
cn = nextSibling(cn);
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static
|
|
String *partial_arg(String *s, String *p) {
|
|
char *c;
|
|
char *cp = Char(p);
|
|
String *prefix;
|
|
String *newarg;
|
|
|
|
/* Find the prefix on the partial argument */
|
|
|
|
c = strchr(cp, '$');
|
|
if (!c) {
|
|
return Copy(s);
|
|
}
|
|
prefix = NewStringWithSize(cp, c - cp);
|
|
newarg = Copy(s);
|
|
Replace(newarg, prefix, "", DOH_REPLACE_ANY | DOH_REPLACE_FIRST);
|
|
Delete(prefix);
|
|
return newarg;
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* Swig_cparse_template_expand()
|
|
* ----------------------------------------------------------------------------- */
|
|
|
|
int Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *tscope) {
|
|
List *patchlist, *cpatchlist, *typelist;
|
|
String *templateargs;
|
|
String *tname;
|
|
String *iname;
|
|
String *tbase;
|
|
patchlist = NewList();
|
|
cpatchlist = NewList();
|
|
typelist = NewList();
|
|
|
|
{
|
|
String *tmp = NewStringEmpty();
|
|
if (tparms) {
|
|
SwigType_add_template(tmp, tparms);
|
|
}
|
|
templateargs = Copy(tmp);
|
|
Delete(tmp);
|
|
}
|
|
|
|
tname = Copy(Getattr(n, "name"));
|
|
tbase = Swig_scopename_last(tname);
|
|
|
|
/* Look for partial specialization matching */
|
|
if (Getattr(n, "partialargs")) {
|
|
Parm *p, *tp;
|
|
ParmList *ptargs = SwigType_function_parms(Getattr(n, "partialargs"));
|
|
p = ptargs;
|
|
tp = tparms;
|
|
while (p && tp) {
|
|
SwigType *ptype;
|
|
SwigType *tptype;
|
|
SwigType *partial_type;
|
|
ptype = Getattr(p, "type");
|
|
tptype = Getattr(tp, "type");
|
|
if (ptype && tptype) {
|
|
partial_type = partial_arg(tptype, ptype);
|
|
/* Printf(stdout,"partial '%s' '%s' ---> '%s'\n", tptype, ptype, partial_type); */
|
|
Setattr(tp, "type", partial_type);
|
|
Delete(partial_type);
|
|
}
|
|
p = nextSibling(p);
|
|
tp = nextSibling(tp);
|
|
}
|
|
assert(ParmList_len(ptargs) == ParmList_len(tparms));
|
|
Delete(ptargs);
|
|
}
|
|
|
|
/*
|
|
Parm *p = tparms;
|
|
while (p) {
|
|
Printf(stdout, "tparm: '%s' '%s' '%s'\n", Getattr(p, "name"), Getattr(p, "type"), Getattr(p, "value"));
|
|
p = nextSibling(p);
|
|
}
|
|
*/
|
|
|
|
/* Printf(stdout,"targs = '%s'\n", templateargs);
|
|
Printf(stdout,"rname = '%s'\n", rname);
|
|
Printf(stdout,"tname = '%s'\n", tname); */
|
|
cparse_template_expand(n, tname, rname, templateargs, patchlist, typelist, cpatchlist);
|
|
|
|
/* Set the name */
|
|
{
|
|
String *name = Getattr(n, "name");
|
|
if (name) {
|
|
Append(name, templateargs);
|
|
}
|
|
iname = name;
|
|
}
|
|
|
|
/* Patch all of the types */
|
|
{
|
|
Parm *tp = Getattr(n, "templateparms");
|
|
Parm *p = tparms;
|
|
/* Printf(stdout,"%s\n", ParmList_str_defaultargs(tp)); */
|
|
|
|
if (tp) {
|
|
Symtab *tsdecl = Getattr(n, "sym:symtab");
|
|
while (p && tp) {
|
|
String *name, *value, *valuestr, *tydef, *tmp, *tmpr;
|
|
int sz, i;
|
|
String *dvalue = 0;
|
|
String *qvalue = 0;
|
|
|
|
name = Getattr(tp, "name");
|
|
value = Getattr(p, "value");
|
|
tydef = Getattr(p, "typedef");
|
|
|
|
if (name) {
|
|
if (!value)
|
|
value = Getattr(p, "type");
|
|
qvalue = Swig_symbol_typedef_reduce(value, tsdecl);
|
|
dvalue = Swig_symbol_type_qualify(qvalue, tsdecl);
|
|
if (SwigType_istemplate(dvalue)) {
|
|
String *ty = Swig_symbol_template_deftype(dvalue, tscope);
|
|
Delete(dvalue);
|
|
dvalue = ty;
|
|
}
|
|
|
|
assert(dvalue);
|
|
valuestr = SwigType_str(dvalue, 0);
|
|
/* Need to patch default arguments */
|
|
{
|
|
Parm *rp = nextSibling(p);
|
|
while (rp) {
|
|
String *rvalue = Getattr(rp, "value");
|
|
if (rvalue) {
|
|
Replace(rvalue, name, dvalue, DOH_REPLACE_ID);
|
|
}
|
|
rp = nextSibling(rp);
|
|
}
|
|
}
|
|
sz = Len(patchlist);
|
|
for (i = 0; i < sz; i++) {
|
|
String *s = Getitem(patchlist, i);
|
|
Replace(s, name, dvalue, DOH_REPLACE_ID);
|
|
}
|
|
sz = Len(typelist);
|
|
for (i = 0; i < sz; i++) {
|
|
String *s = Getitem(typelist, i);
|
|
/* Replace(s,name,value, DOH_REPLACE_ID); */
|
|
/* Printf(stdout,"name = '%s', value = '%s', tbase = '%s', iname='%s' s = '%s' --> ", name, dvalue, tbase, iname, s); */
|
|
SwigType_typename_replace(s, name, dvalue);
|
|
SwigType_typename_replace(s, tbase, iname);
|
|
/* Printf(stdout,"'%s'\n", s); */
|
|
}
|
|
|
|
if (!tydef) {
|
|
tydef = dvalue;
|
|
}
|
|
tmp = NewStringf("#%s", name);
|
|
tmpr = NewStringf("\"%s\"", valuestr);
|
|
|
|
sz = Len(cpatchlist);
|
|
for (i = 0; i < sz; i++) {
|
|
String *s = Getitem(cpatchlist, i);
|
|
Replace(s, tmp, tmpr, DOH_REPLACE_ID);
|
|
/* Replace(s,name,tydef, DOH_REPLACE_ID); */
|
|
Replace(s, name, valuestr, DOH_REPLACE_ID);
|
|
}
|
|
Delete(tmp);
|
|
Delete(tmpr);
|
|
Delete(valuestr);
|
|
Delete(dvalue);
|
|
Delete(qvalue);
|
|
}
|
|
p = nextSibling(p);
|
|
tp = nextSibling(tp);
|
|
if (!p)
|
|
p = tp;
|
|
}
|
|
} else {
|
|
/* No template parameters at all. This could be a specialization */
|
|
int i, sz;
|
|
sz = Len(typelist);
|
|
for (i = 0; i < sz; i++) {
|
|
String *s = Getitem(typelist, i);
|
|
SwigType_typename_replace(s, tbase, iname);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Patch bases */
|
|
{
|
|
List *bases = Getattr(n, "baselist");
|
|
if (bases) {
|
|
Iterator b;
|
|
for (b = First(bases); b.item; b = Next(b)) {
|
|
String *qn = Swig_symbol_type_qualify(b.item, tscope);
|
|
Clear(b.item);
|
|
Append(b.item, qn);
|
|
Delete(qn);
|
|
}
|
|
}
|
|
}
|
|
Delete(patchlist);
|
|
Delete(cpatchlist);
|
|
Delete(typelist);
|
|
Delete(tbase);
|
|
Delete(tname);
|
|
Delete(templateargs);
|
|
|
|
/* set_nodeType(n,"template"); */
|
|
return 0;
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* template_locate()
|
|
*
|
|
* Search for a template that matches name with given parameters.
|
|
* ----------------------------------------------------------------------------- */
|
|
|
|
static Node *template_locate(String *name, Parm *tparms, Symtab *tscope) {
|
|
Node *n;
|
|
String *tname, *rname = 0;
|
|
Node *templ;
|
|
List *mpartials = 0;
|
|
Parm *p;
|
|
Parm *parms;
|
|
Parm *targs;
|
|
ParmList *expandedparms;
|
|
|
|
tname = Copy(name);
|
|
parms = CopyParmList(tparms);
|
|
|
|
/* Search for generic template */
|
|
templ = Swig_symbol_clookup(name, 0);
|
|
|
|
/* Add default values from generic template */
|
|
if (templ) {
|
|
Symtab *tsdecl = Getattr(templ, "sym:symtab");
|
|
|
|
targs = Getattr(templ, "templateparms");
|
|
expandedparms = Swig_symbol_template_defargs(parms, targs, tscope, tsdecl);
|
|
} else {
|
|
expandedparms = parms;
|
|
}
|
|
|
|
|
|
/* reduce the typedef */
|
|
p = expandedparms;
|
|
while (p) {
|
|
SwigType *ty = Getattr(p, "type");
|
|
if (ty) {
|
|
SwigType *nt = Swig_symbol_type_qualify(ty, tscope);
|
|
Setattr(p, "type", nt);
|
|
Delete(nt);
|
|
}
|
|
p = nextSibling(p);
|
|
}
|
|
|
|
SwigType_add_template(tname, expandedparms);
|
|
|
|
if (template_debug) {
|
|
Printf(stdout, "\n%s:%d: template_debug: Searching for %s\n", cparse_file, cparse_line, tname);
|
|
}
|
|
|
|
/* Search for an exact specialization.
|
|
Example: template<> class name<int> { ... } */
|
|
{
|
|
if (template_debug) {
|
|
Printf(stdout, " searching: '%s' (exact specialization)\n", tname);
|
|
}
|
|
n = Swig_symbol_clookup_local(tname, 0);
|
|
if (!n) {
|
|
SwigType *rname = Swig_symbol_typedef_reduce(tname, tscope);
|
|
if (!Equal(rname, tname)) {
|
|
if (template_debug) {
|
|
Printf(stdout, " searching: '%s' (exact specialization)\n", rname);
|
|
}
|
|
n = Swig_symbol_clookup_local(rname, 0);
|
|
}
|
|
Delete(rname);
|
|
}
|
|
if (n) {
|
|
Node *tn;
|
|
String *nodeType = nodeType(n);
|
|
if (Equal(nodeType, "template"))
|
|
goto success;
|
|
tn = Getattr(n, "template");
|
|
if (tn) {
|
|
n = tn;
|
|
goto success; /* Previously wrapped by a template return that */
|
|
}
|
|
Swig_error(cparse_file, cparse_line, "'%s' is not defined as a template. (%s)\n", name, nodeType(n));
|
|
Delete(tname);
|
|
Delete(parms);
|
|
return 0; /* Found a match, but it's not a template of any kind. */
|
|
}
|
|
}
|
|
|
|
/* Search for partial specialization.
|
|
Example: template<typename T> class name<T *> { ... } */
|
|
|
|
/* Generate reduced template name (stripped of extraneous pointers, etc.) */
|
|
|
|
rname = NewStringf("%s<(", name);
|
|
p = parms;
|
|
while (p) {
|
|
String *t;
|
|
t = Getattr(p, "type");
|
|
if (!t)
|
|
t = Getattr(p, "value");
|
|
if (t) {
|
|
String *ty = Swig_symbol_typedef_reduce(t, tscope);
|
|
String *tb = SwigType_base(ty);
|
|
String *td = SwigType_default(ty);
|
|
Replaceid(td, "enum SWIGTYPE", tb);
|
|
Replaceid(td, "SWIGTYPE", tb);
|
|
Append(rname, td);
|
|
Delete(tb);
|
|
Delete(ty);
|
|
Delete(td);
|
|
}
|
|
p = nextSibling(p);
|
|
if (p) {
|
|
Append(rname, ",");
|
|
}
|
|
}
|
|
Append(rname, ")>");
|
|
|
|
mpartials = NewList();
|
|
if (templ) {
|
|
/* First, we search using an exact type prototype */
|
|
Parm *p;
|
|
char tmp[32];
|
|
int i;
|
|
List *partials;
|
|
String *ss;
|
|
Iterator pi;
|
|
|
|
partials = Getattr(templ, "partials");
|
|
if (partials) {
|
|
for (pi = First(partials); pi.item; pi = Next(pi)) {
|
|
ss = Copy(pi.item);
|
|
p = parms;
|
|
i = 1;
|
|
while (p) {
|
|
String *t, *tn;
|
|
sprintf(tmp, "$%d", i);
|
|
t = Getattr(p, "type");
|
|
if (!t)
|
|
t = Getattr(p, "value");
|
|
if (t) {
|
|
String *ty = Swig_symbol_typedef_reduce(t, tscope);
|
|
tn = SwigType_base(ty);
|
|
Replaceid(ss, tmp, tn);
|
|
Delete(tn);
|
|
Delete(ty);
|
|
}
|
|
i++;
|
|
p = nextSibling(p);
|
|
}
|
|
if (template_debug) {
|
|
Printf(stdout, " searching: '%s' (partial specialization - %s)\n", ss, pi.item);
|
|
}
|
|
if ((Equal(ss, tname)) || (Equal(ss, rname))) {
|
|
Append(mpartials, pi.item);
|
|
}
|
|
Delete(ss);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (template_debug) {
|
|
Printf(stdout, " Matched partials: %s\n", mpartials);
|
|
}
|
|
|
|
if (Len(mpartials)) {
|
|
String *s = Getitem(mpartials, 0);
|
|
n = Swig_symbol_clookup_local(s, 0);
|
|
if (Len(mpartials) > 1) {
|
|
if (n) {
|
|
Swig_warning(WARN_PARSE_TEMPLATE_AMBIG, cparse_file, cparse_line, "Instantiation of template '%s' is ambiguous,\n", SwigType_namestr(tname));
|
|
Swig_warning(WARN_PARSE_TEMPLATE_AMBIG, Getfile(n), Getline(n), " instantiation '%s' is used.\n", SwigType_namestr(Getattr(n, "name")));
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!n) {
|
|
n = templ;
|
|
}
|
|
if (!n) {
|
|
Swig_error(cparse_file, cparse_line, "Template '%s' undefined.\n", name);
|
|
} else if (n) {
|
|
String *nodeType = nodeType(n);
|
|
if (!Equal(nodeType, "template")) {
|
|
Swig_error(cparse_file, cparse_line, "'%s' is not defined as a template. (%s)\n", name, nodeType);
|
|
n = 0;
|
|
}
|
|
}
|
|
success:
|
|
Delete(tname);
|
|
Delete(rname);
|
|
Delete(mpartials);
|
|
if ((template_debug) && (n)) {
|
|
Printf(stdout, "Node: %p\n", n);
|
|
Swig_print_node(n);
|
|
}
|
|
Delete(parms);
|
|
return n;
|
|
}
|
|
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* Swig_cparse_template_locate()
|
|
*
|
|
* Search for a template that matches name with given parameters.
|
|
* For templated classes finds the specialized template should there be one.
|
|
* For templated functions finds the unspecialized template even if a specialized
|
|
* template exists.
|
|
* ----------------------------------------------------------------------------- */
|
|
|
|
Node *Swig_cparse_template_locate(String *name, Parm *tparms, Symtab *tscope) {
|
|
Node *n = template_locate(name, tparms, tscope); /* this function does what we want for templated classes */
|
|
|
|
if (n) {
|
|
String *nodeType = nodeType(n);
|
|
int isclass = 0;
|
|
assert(Equal(nodeType, "template"));
|
|
isclass = (Equal(Getattr(n, "templatetype"), "class"));
|
|
if (!isclass) {
|
|
/* If not a templated class we must have a templated function.
|
|
The template found is not necessarily the one we want when dealing with templated
|
|
functions. We don't want any specialized templated functions as they won't have
|
|
the default parameters. Lets look for the unspecialized template. Also make sure
|
|
the number of template parameters is correct as it is possible to overload a
|
|
templated function with different numbers of template parameters. */
|
|
|
|
if (template_debug) {
|
|
Printf(stdout, " Not a templated class, seeking most appropriate templated function\n");
|
|
}
|
|
|
|
n = Swig_symbol_clookup_local(name, 0);
|
|
while (n) {
|
|
Parm *tparmsfound = Getattr(n, "templateparms");
|
|
if (ParmList_len(tparms) == ParmList_len(tparmsfound)) {
|
|
/* successful match */
|
|
break;
|
|
}
|
|
/* repeat until we find a match with correct number of templated parameters */
|
|
n = Getattr(n, "sym:nextSibling");
|
|
}
|
|
|
|
if (!n) {
|
|
Swig_error(cparse_file, cparse_line, "Template '%s' undefined.\n", name);
|
|
}
|
|
|
|
if ((template_debug) && (n)) {
|
|
Printf(stdout, "Templated function found: %p\n", n);
|
|
Swig_print_node(n);
|
|
}
|
|
}
|
|
}
|
|
|
|
return n;
|
|
}
|