From d3809285a4aeaecd0286f72712637fd76415b39e Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 13 Aug 2009 03:58:09 +0000
Subject: [PATCH] Change class names in test code which clash with PHP reserved
 words (Interface, Class, and Function - these are case insensitive reserved
 words in PHP).

Fix lists of expected methods in rename_scope_runme.php to match those
which we expect with PHP5.  With this and the change above, this testcase
now passes.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11545 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/php/rename_scope_runme.php |  8 ++++----
 Examples/test-suite/rename_scope.i             | 10 +++++-----
 Examples/test-suite/template_default_qualify.i |  6 +++---
 Examples/test-suite/template_enum_ns_inherit.i | 14 +++++++-------
 Examples/test-suite/template_enum_typedef.i    |  6 +++---
 Examples/test-suite/template_ns4.i             | 16 ++++++++--------
 Examples/test-suite/valuewrapper_base.i        |  8 ++++----
 7 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/Examples/test-suite/php/rename_scope_runme.php b/Examples/test-suite/php/rename_scope_runme.php
index 6da5c4a5c..6c66906c6 100644
--- a/Examples/test-suite/php/rename_scope_runme.php
+++ b/Examples/test-suite/php/rename_scope_runme.php
@@ -6,10 +6,10 @@ require "rename_scope.php";
 
 check::classes(array("rename_scope","Interface_UP","Interface_BP","Natural_UP","Natural_BP","Bucket"));
 
-check::classmethods("Interface_UP",array("__construct"));
-check::classmethods("Interface_BP",array("__construct"));
-check::classmethods("Natural_UP",array("__construct","rtest"));
-check::classmethods("Natural_BP",array("__construct","rtest"));
+check::classmethods("Interface_UP",array("__construct","__set","__isset","__get"));
+check::classmethods("Interface_BP",array("__construct","__set","__isset","__get"));
+check::classmethods("Natural_UP",array("__construct","__set","__isset","__get","rtest"));
+check::classmethods("Natural_BP",array("__construct","__set","__isset","__get","rtest"));
 check::classparent("Natural_UP","Interface_UP");
 check::classparent("Natural_BP","Interface_BP");
 
diff --git a/Examples/test-suite/rename_scope.i b/Examples/test-suite/rename_scope.i
index 6bea35b0e..9a09949c4 100644
--- a/Examples/test-suite/rename_scope.i
+++ b/Examples/test-suite/rename_scope.i
@@ -7,7 +7,7 @@
     enum Polarization { UnaryPolarization, BinaryPolarization }; 
  
     template <Polarization P> 
-    struct Interface 
+    struct Interface_
     { 
     };    
   } 
@@ -15,9 +15,9 @@
  
 namespace oss 
 { 
-  // Interface 
-  %template(Interface_UP) Interface<UnaryPolarization>; 
-  %template(Interface_BP) Interface<BinaryPolarization>; 
+  // Interface_ 
+  %template(Interface_UP) Interface_<UnaryPolarization>; 
+  %template(Interface_BP) Interface_<BinaryPolarization>; 
  
 } 
 %inline 
@@ -27,7 +27,7 @@ namespace oss
     namespace interfaces 
     { 
       template <Polarization P> 
-      struct Natural : Interface<P> 
+      struct Natural : Interface_<P> 
       { 
            int test(void) { return 1; }
       };      
diff --git a/Examples/test-suite/template_default_qualify.i b/Examples/test-suite/template_default_qualify.i
index bcba1a44e..640011b2c 100644
--- a/Examples/test-suite/template_default_qualify.i
+++ b/Examples/test-suite/template_default_qualify.i
@@ -12,14 +12,14 @@
     enum Polarization { UnaryPolarization, BinaryPolarization };
  
     template <Polarization P>
-    struct Interface
+    struct Interface_
     {
     };
 
     namespace modules
     {
  
-      template <class traits, class base = Interface<traits::pmode> >
+      template <class traits, class base = Interface_<traits::pmode> >
  // *** problem here ****
       struct Module : base
       {
@@ -35,7 +35,7 @@
  
 namespace oss
 {	
-  %template(Interface_UP) Interface<UnaryPolarization>;
+  %template(Interface_UP) Interface_<UnaryPolarization>;
   namespace modules
   {
     %template(Module_etraits) Module<etraits>;
diff --git a/Examples/test-suite/template_enum_ns_inherit.i b/Examples/test-suite/template_enum_ns_inherit.i
index 8992eef6d..c617b5716 100644
--- a/Examples/test-suite/template_enum_ns_inherit.i
+++ b/Examples/test-suite/template_enum_ns_inherit.i
@@ -6,7 +6,7 @@
     enum Polarization { UnaryPolarization, BinaryPolarization };
  
     template <Polarization P>
-    struct Interface
+    struct Interface_
     {
     };
 
@@ -21,8 +21,8 @@
  
 namespace oss
 {
-  %template(Interface_UP) Interface<UnaryPolarization>;
-  %template(Module_UPIUP) Module<UnaryPolarization,Interface<UnaryPolarization> >;
+  %template(Interface_UP) Interface_<UnaryPolarization>;
+  %template(Module_UPIUP) Module<UnaryPolarization,Interface_<UnaryPolarization> >;
 }
  
 %inline %{
@@ -31,18 +31,18 @@ namespace oss
     namespace hello
     {
       struct HInterface1 :
-           Interface<oss::UnaryPolarization>  // this works (with fullns qualification)
+           Interface_<oss::UnaryPolarization>  // this works (with fullns qualification)
       {
       };
  
       struct HInterface2 :
-          Interface<UnaryPolarization>       // this doesn't work
+          Interface_<UnaryPolarization>       // this doesn't work
       {
       };
  
-     struct HModule1 : Module<UnaryPolarization, Interface<UnaryPolarization> > {
+     struct HModule1 : Module<UnaryPolarization, Interface_<UnaryPolarization> > {
  };
 
     }
   }
-%}                                   
\ No newline at end of file
+%}                                   
diff --git a/Examples/test-suite/template_enum_typedef.i b/Examples/test-suite/template_enum_typedef.i
index 9752d0858..38444594e 100644
--- a/Examples/test-suite/template_enum_typedef.i
+++ b/Examples/test-suite/template_enum_typedef.i
@@ -9,7 +9,7 @@
     enum Polarization { UnaryPolarization, BinaryPolarization };
  
     template <Polarization P>
-    struct Interface
+    struct Interface_
     {
     };
  
@@ -25,7 +25,7 @@
       typedef Traits traits;
       static const Polarization P = traits::pmode;
  
-      void get(Interface<P> arg) { };   // Here P is only replace by traits::pmode
+      void get(Interface_<P> arg) { };   // Here P is only replace by traits::pmode
  
     };
   }
@@ -34,6 +34,6 @@
  
 namespace oss
 {
-  %template(Interface_UP) Interface<UnaryPolarization>;
+  %template(Interface_UP) Interface_<UnaryPolarization>;
   %template(Module_UP) Module<etraits>;
 }                                                                 
diff --git a/Examples/test-suite/template_ns4.i b/Examples/test-suite/template_ns4.i
index 34489c473..f5c134852 100644
--- a/Examples/test-suite/template_ns4.i
+++ b/Examples/test-suite/template_ns4.i
@@ -8,13 +8,13 @@
     };
    
     template <class ArgType, class ResType>
-    struct Function
+    struct Function_
     {     
 	char *test() { return (char *) "test"; }
     };
    
     template <class AF, class RF>
-    struct ArithFunction : Function<AF, RF>
+    struct ArithFunction : Function_<AF, RF>
     {
     };
    
@@ -40,7 +40,7 @@
     };   
 
     template <class AF, class RF>
-    class Class : public ArithFunction< typename traits<AF, RF>::arg_type,
+    class Class_ : public ArithFunction< typename traits<AF, RF>::arg_type,
                     typename traits<AF, RF>::res_type >
     {
     };
@@ -49,7 +49,7 @@
     typename traits<AF, RF>::base
     make_Class()
     {
-      return Class<AF, RF>();
+      return Class_<AF, RF>();
     }
 
 
@@ -58,9 +58,9 @@
 
 %{  
   namespace hello {
-    template struct Function <Double, Double>;
+    template struct Function_ <Double, Double>;
     template struct ArithFunction <Double, Double>;
-    template class Class <Double, Double>;   
+    template class Class_ <Double, Double>;   
   }  
 %}
 
@@ -69,9 +69,9 @@
   // This complains only when using a namespace
   //
   %template() traits<Double,Double>;
-  %template(Function_DD) Function <Double, Double>;
+  %template(Function_DD) Function_ <Double, Double>;
   %template(ArithFunction_DD) ArithFunction <Double, Double>;
-  %template(Class_DD) Class <Double, Double>;
+  %template(Class_DD) Class_ <Double, Double>;
   %template(make_Class_DD) make_Class <Double, Double>;
  }
 
diff --git a/Examples/test-suite/valuewrapper_base.i b/Examples/test-suite/valuewrapper_base.i
index 1698c3e03..63471bbc8 100644
--- a/Examples/test-suite/valuewrapper_base.i
+++ b/Examples/test-suite/valuewrapper_base.i
@@ -10,9 +10,9 @@
     };    
  
     template <Polarization P> 
-    struct Interface : Base 
+    struct Interface_ : Base 
     { 
-      Interface(const Base& b) { }; 
+      Interface_(const Base& b) { }; 
     }; 
     
     template <class Result> 
@@ -23,6 +23,6 @@
 namespace oss 
 { 
   // Interface 
-  %template(Interface_BP) Interface<BinaryPolarization>; 
-  %template(make_Interface_BP) make<Interface<BinaryPolarization> >; 
+  %template(Interface_BP) Interface_<BinaryPolarization>; 
+  %template(make_Interface_BP) make<Interface_<BinaryPolarization> >; 
 }