[PHP] Update warnings about clashes between identifiers and PHP

keywords and automatic renaming to work with the PHP5 class 
wrappers.  Fixes SF#1613679.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11460 626c5289-ae23-0410-ae9c-e8d60b6d4f22

CHANGES.current

@@ -1,6 +1,11 @@
 Version 1.3.40 (in progress)
 ============================
 
+2009-07-28: olly
+	    [PHP] Update warnings about clashes between identifiers and PHP
+	    keywords and automatic renaming to work with the PHP5 class
+	    wrappers.  Fixes SF#1613679.
+
 2009-07-28: vmiklos
             [PHP] If a member function is not public but it has a base
             which is public, then now a warning is issued and the member

Examples/test-suite/name_warnings.i

@@ -35,7 +35,9 @@ namespace std
   {
     typedef complex None;
     
+#ifndef SWIGPHP // clone() *is* an invalid method name in PHP.
     A* clone(int) { return NULL; }
+#endif
     
     virtual ~A() {}
     virtual int func() = 0;

Examples/test-suite/operator_overload_break.i

@@ -12,7 +12,6 @@
 %rename(PlusPlusPostfix) operator++(int);
 #endif
 
-
 %{
 #include <iostream>
 using namespace std;
@@ -56,7 +55,7 @@ public:
 
     Op& operator++() {k++; return *this;}
 
-    void Print() {std::cerr << k << std::endl;}
+    void PrintK() {std::cerr << k << std::endl;}
 
     int k;
 };

Examples/test-suite/php/Makefile.in

@@ -8,8 +8,8 @@ srcdir       = @srcdir@
 top_srcdir   = @top_srcdir@
 top_builddir = @top_builddir@
 
-#CPP_TEST_CASES += \
-#	php_namewarn_rename \
+CPP_TEST_CASES += \
+	php_namewarn_rename \
 
 include $(srcdir)/../common.mk
 

Examples/test-suite/template_default.i

@@ -1,8 +1,7 @@
 %module template_default
 
-
-
 %warnfilter(SWIGWARN_RUBY_WRONG_NAME) ns1::Traits::c; /* Ruby, wrong constant name */
+
 namespace ns1 {
   namespace ns2 {
   
@@ -154,8 +153,8 @@ namespace ns1 {
 %}
 
 
-%template(Do) ns1::ns4::D<ns1::Traits>;
-%template(Bo) ns1::ns4::Base<ns1::Traits, ns1::ns4::D<ns1::Traits> >;
+%template(Doo) ns1::ns4::D<ns1::Traits>;
+%template(Boo) ns1::ns4::Base<ns1::Traits, ns1::ns4::D<ns1::Traits> >;
 
 
 

Examples/test-suite/template_default2.i

@@ -8,7 +8,7 @@
     enum Polarization { UnaryPolarization, BinaryPolarization };
  
     template <Polarization P>
-    struct Interface
+    struct Interface_tpl
     {
     };
  
@@ -19,7 +19,7 @@
  
     template <class C,
           Polarization P = C::pmode,
-          class Base = Interface<P> >   // **** problem here *****
+          class Base = Interface_tpl<P> >   // **** problem here *****
     struct Module : Base
     {
     };
@@ -29,12 +29,12 @@
 
 namespace oss
 {
-  %template(Interface_UP) Interface<UnaryPolarization>;
+  %template(Interface_UP) Interface_tpl<UnaryPolarization>;
  
   // This works
   %template(Module_UP1) Module<traits,
                    UnaryPolarization,
-                   Interface<UnaryPolarization> >;
+                   Interface_tpl<UnaryPolarization> >;
  
    // These don't
   %template(Module_UP2) Module<traits, UnaryPolarization>;

Lib/php/phpkw.swg

@@ -3,19 +3,13 @@
  * of SWIG, and the README file for authors - http://www.swig.org/release.html.
  *
  * phpkw.swg
- *
- * The 'keywords' in PHP are global, ie, the following names are fine
- * when used as class methods.
  * ----------------------------------------------------------------------------- */
 
-#define PHPKW(x) %keywordwarn("'" `x` "' is a PHP keyword, renamed as 'c_" `x` "'",sourcefmt="%(lower)s", rename="c_%s",fullname=1)  `x`
+#define PHPKW(x) %keywordwarn("'" `x` "' is a PHP keyword, renamed as 'c_" `x` "'",sourcefmt="%(lower)s",$isclass,rename="c_%s")  `x`
 
-%define PHPCN(x) 
-%keywordwarn("'" `x` "' is a PHP reserved class name, class renamed as 'c_" `x` "'",%$isclass,rename="c_%s") `x`;
-%keywordwarn("'" `x` "' is a PHP reserved class name, constructor renamed as 'c_" `x` "'",%$isconstructor,rename="c_%s") `x`;
-%enddef
+#define PHPCN(x) %keywordwarn("'" `x` "' is a PHP reserved class name, class renamed as 'c_" `x` "'",%$isclass,rename="c_%s") `x`
 
-#define PHPBN1(x) %builtinwarn("'" `x` "' conflicts with a built-in name in PHP",sourcefmt="%(lower)s",fullname=1)  `x`
+#define PHPBN1(x) %builtinwarn("'" `x` "' conflicts with a built-in name in PHP",sourcefmt="%(lower)s")  `x`
 #define PHPBN2(x) %builtinwarn("'" `x` "' conflicts with a built-in name in PHP")  "::" `x`
 
 

Source/Modules/php.cxx

@@ -12,9 +12,6 @@
  *
  * Short term:
  *
- * Sort out auto-renaming of method and class names which are reserved
- *   words (e.g. empty, clone, exception, etc.)
- *
  * Sort out wrapping of static member variables in OO PHP5.
  *
  * Medium term: