jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WARN_* constants are user visible, so keep existing WARN_PHP4_* for

Browse source 
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.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10633 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2008-07-03 00:09:56 +00:00
commit 7dfd9aae31
32 changed files with 2388 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/test-suite/abstract_virtual.i
View file

@ -2,10 +2,10 @@
%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) D; /* C#, Java, Php4 multiple inheritance */ SWIGWARN_PHP_MULTIPLE_INHERITANCE) D; /* C#, Java, PHP multiple inheritance */
%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) E; /* C#, Java, Php4 multiple inheritance */ SWIGWARN_PHP_MULTIPLE_INHERITANCE) E; /* C#, Java, PHP multiple inheritance */
%inline %{ %inline %{
#if defined(_MSC_VER) #if defined(_MSC_VER)

2
Examples/test-suite/contract.i
View file

@ -3,7 +3,7 @@
%warnfilter(SWIGWARN_RUBY_MULTIPLE_INHERITANCE, %warnfilter(SWIGWARN_RUBY_MULTIPLE_INHERITANCE,
SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) C; /* Ruby, C#, Java, Php4 multiple inheritance */ SWIGWARN_PHP_MULTIPLE_INHERITANCE) C; /* Ruby, C#, Java, PHP multiple inheritance */
#ifdef SWIGCSHARP #ifdef SWIGCSHARP
%ignore B::bar; // otherwise get a warning: `C.bar' no suitable methods found to override %ignore B::bar; // otherwise get a warning: `C.bar' no suitable methods found to override

4
Examples/test-suite/default_constructor.i
View file

@ -5,11 +5,11 @@
%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) EB; /* C#, Java, Php4 multiple inheritance */ SWIGWARN_PHP_MULTIPLE_INHERITANCE) EB; /* C#, Java, PHP multiple inheritance */
%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) AD; /* C#, Java, Php4 multiple inheritance */ SWIGWARN_PHP_MULTIPLE_INHERITANCE) AD; /* C#, Java, PHP multiple inheritance */
%warnfilter(SWIGWARN_LANG_FRIEND_IGNORE) F; /* friend function */ %warnfilter(SWIGWARN_LANG_FRIEND_IGNORE) F; /* friend function */

2
Examples/test-suite/evil_diamond.i
View file

@ -6,7 +6,7 @@
%warnfilter(SWIGWARN_RUBY_WRONG_NAME, %warnfilter(SWIGWARN_RUBY_WRONG_NAME,
SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) spam; // Ruby, wrong class name - C# & Java, Php4 multiple inheritance SWIGWARN_PHP_MULTIPLE_INHERITANCE) spam; // Ruby, wrong class name - C# & Java, PHP multiple inheritance
%inline %{ %inline %{

2
Examples/test-suite/evil_diamond_ns.i
View file

@ -6,7 +6,7 @@
%warnfilter(SWIGWARN_RUBY_WRONG_NAME, %warnfilter(SWIGWARN_RUBY_WRONG_NAME,
SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) Blah::spam; // Ruby, wrong class name - C# & Java, Php4 multiple inheritance SWIGWARN_PHP_MULTIPLE_INHERITANCE) Blah::spam; // Ruby, wrong class name - C# & Java, PHP multiple inheritance
%inline %{ %inline %{
namespace Blah { namespace Blah {

2
Examples/test-suite/evil_diamond_prop.i
View file

@ -6,7 +6,7 @@
%warnfilter(SWIGWARN_RUBY_WRONG_NAME, %warnfilter(SWIGWARN_RUBY_WRONG_NAME,
SWIGWARN_JAVA_MULTIPLE_INHERITANCE, SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) spam; // Ruby, wrong class name - C# & Java, Php4 multiple inheritance SWIGWARN_PHP_MULTIPLE_INHERITANCE) spam; // Ruby, wrong class name - C# & Java, PHP multiple inheritance
%inline %{ %inline %{

4
Examples/test-suite/multiple_inheritance.i
View file

@ -5,11 +5,11 @@ It tests basic multiple inheritance */
%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar; /* C#, Java, Php4 multiple inheritance */ SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar; /* C#, Java, PHP multiple inheritance */
%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBarSpam; /* C#, Java, Php4 multiple inheritance */ SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBarSpam; /* C#, Java, PHP multiple inheritance */
%inline %{ %inline %{

2
Examples/test-suite/pure_virtual.i
View file

@ -9,7 +9,7 @@
%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) E; /* C#, Java, Php4 multiple inheritance */ SWIGWARN_PHP_MULTIPLE_INHERITANCE) E; /* C#, Java, PHP multiple inheritance */
%nodefaultctor C; %nodefaultctor C;
%nodefaultdtor C; %nodefaultdtor C;

2
Examples/test-suite/template_inherit_abstract.i
View file

@ -4,7 +4,7 @@
%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) oss::Module; /* C#, Java, Php4 multiple inheritance */ SWIGWARN_PHP_MULTIPLE_INHERITANCE) oss::Module; /* C#, Java, PHP multiple inheritance */
%inline %{ %inline %{

6
Examples/test-suite/using_composition.i
View file

@ -2,13 +2,13 @@
%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar; // C#, Java, Php4 multiple inheritance SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar; // C#, Java, PHP multiple inheritance
%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar2; // C#, Java, Php4 multiple inheritance SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar2; // C#, Java, PHP multiple inheritance
%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar3; // C#, Java, Php4 multiple inheritance SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar3; // C#, Java, PHP multiple inheritance
#ifdef SWIGLUA // lua only has one numeric type, so some overloads shadow each other creating warnings #ifdef SWIGLUA // lua only has one numeric type, so some overloads shadow each other creating warnings
%warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) blah; %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) blah;
#endif #endif

2
Examples/test-suite/using_extend.i
View file

@ -2,7 +2,7 @@
%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar; // C#, Java, Php4 multiple inheritance SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar; // C#, Java, PHP multiple inheritance
#ifdef SWIGLUA // lua only has one numeric type, so some overloads shadow each other creating warnings #ifdef SWIGLUA // lua only has one numeric type, so some overloads shadow each other creating warnings
%warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) blah; %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) blah;
#endif #endif

2
Examples/test-suite/using_namespace.i
View file

@ -5,7 +5,7 @@
%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE, %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
SWIGWARN_CSHARP_MULTIPLE_INHERITANCE, SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
SWIGWARN_PHP4_MULTIPLE_INHERITANCE) Hi<hello::Hello, hi::hi0>; // C#, Java, Php4 multiple inheritance SWIGWARN_PHP_MULTIPLE_INHERITANCE) Hi<hello::Hello, hi::hi0>; // C#, Java, PHP multiple inheritance
%inline %{ %inline %{
namespace hello namespace hello

0
Lib/php4/const.i → Lib/php/const.i
View file

0
Lib/php4/globalvar.i → Lib/php/globalvar.i
View file

0
Lib/php4/php4.swg → Lib/php/php4.swg
View file

0
Lib/php4/php4init.swg → Lib/php/php4init.swg
View file

0
Lib/php4/php4kw.swg → Lib/php/php4kw.swg
View file

0
Lib/php4/php4run.swg → Lib/php/php4run.swg
View file

0
Lib/php4/phppointers.i → Lib/php/phppointers.i
View file

0
Lib/php4/std_common.i → Lib/php/std_common.i
View file

0
Lib/php4/std_deque.i → Lib/php/std_deque.i
View file

0
Lib/php4/std_map.i → Lib/php/std_map.i
View file

0
Lib/php4/std_pair.i → Lib/php/std_pair.i
View file

0
Lib/php4/std_string.i → Lib/php/std_string.i
View file

0
Lib/php4/std_vector.i → Lib/php/std_vector.i
View file

0
Lib/php4/stl.i → Lib/php/stl.i
View file

0
Lib/php4/typemaps.i → Lib/php/typemaps.i
View file

2
Lib/php4/utils.i → Lib/php/utils.i
View file

@ -29,7 +29,7 @@
%enddef %enddef
%define %pass_by_val( TYPE, CONVERT_IN ) %define %pass_by_val( TYPE, CONVERT_IN )
%typemap(in) TYPE %typemap(in) TYPE, const TYPE &
%{ %{
CONVERT_IN($1,$1_ltype,$input); CONVERT_IN($1,$1_ltype,$input);
%} %}

13
Source/Include/swigwarn.h
View file

@ -247,10 +247,17 @@
/* please leave 850-869 free for Modula 3 */ /* please leave 850-869 free for Modula 3 */
#define WARN_PHP4_MULTIPLE_INHERITANCE 870 /* These are needed for backward compatibility, but you don't need to add
#define WARN_PHP4_UNKNOWN_PRAGMA 871 * PHP4 versions of new warnings since existing user interface files can't
* be using them.
*/
#define WARN_PHP4_MULTIPLE_INHERITANCE 870
#define WARN_PHP4_UNKNOWN_PRAGMA 871
/* please leave 870-889 free for Php */ #define WARN_PHP_MULTIPLE_INHERITANCE 870
#define WARN_PHP_UNKNOWN_PRAGMA 871
/* please leave 870-889 free for PHP */
/* Feel free to claim any number in this space that's not currently being used. Just make sure you /* Feel free to claim any number in this space that's not currently being used. Just make sure you

2
Source/Makefile.am
View file

@ -57,7 +57,7 @@ eswig_SOURCES = CParse/cscanner.c \
Modules/octave.cxx \ Modules/octave.cxx \
Modules/overload.cxx \ Modules/overload.cxx \
Modules/perl5.cxx \ Modules/perl5.cxx \
Modules/php4.cxx \ Modules/php.cxx \
Modules/pike.cxx \ Modules/pike.cxx \
Modules/python.cxx \ Modules/python.cxx \
Modules/r.cxx \ Modules/r.cxx \

2359
Source/Modules/php.cxx Normal file
View file

File diff suppressed because it is too large Load diff

0
Source/Modules/php4.cxx → Source/Modules/php5.cxx
View file