fix %extend+overload error

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

Examples/test-suite/extend_placement.i

@@ -9,6 +9,7 @@
   ~Foo() { delete self;}
   int spam(int x) { return x; }
   int spam(int x, int y) { return x + y ; }
+  int spam(int x, int y,int z) { return x + y ; }
 };
 
 %inline %{
@@ -26,6 +27,7 @@ public:
 %inline %{
 class Bar {
 public:
+  Bar() { }
   int spam() { return 1; }
   int spam(const char* c) { return 2; }
 };
@@ -33,7 +35,61 @@ public:
 
 
 %extend Bar {
-    Bar() { return new Bar(); }
+  Bar(int a) { return new Bar(); }
   ~Bar() { delete self;}
-    //    int spam(int x) { return x; }
+  int spam() { return 1}
+  int spam(int x) { return x; }
+  int spam(int x, int y) { return x + y ; }
+  int spam(int x, int y,int z) { return x + y ; }
 };
+
+
+// testing templates
+
+// Before the class
+
+%extend FooT {
+  FooT(int a) { return new FooT<T>(); }
+  ~FooT() { delete self;}
+  int spam(int x) { return x; }
+  int spam(int x, int y) { return x + y ; }
+  int spam(int x, int y,int z) { return x + y ; }
+};
+
+%inline %{
+template<class T>
+class FooT {
+public:
+  FooT(){}
+
+  int spam() { return 1; }
+  int spam(const char* c) { return 2; }
+};
+%}
+
+%template(FooTi) FooT<int>;
+
+
+// After the class
+
+%inline %{
+template<class T>
+class BarT {
+public:
+  BarT() { }
+  int spam() { return 1; }
+  int spam(const char* c) { return 2; }
+};
+%}
+
+
+%extend BarT {
+  BarT(int a) { return new BarT<T>(); }
+  ~BarT() { delete self;}
+  int spam() { return 1}
+  int spam(int x) { return x; }
+  int spam(int x, int y) { return x + y ; }
+  int spam(int x, int y,int z) { return x + y ; }
+};
+
+%template(BarTi) BarT<int>;

Examples/test-suite/python/extend_placement_runme.py

@@ -1,10 +1,36 @@
 import extend_placement
-import types
 
+foo = extend_placement.Foo()
 foo = extend_placement.Foo(1)
-print type(foo)
+foo.spam()
-print foo.spam()
+foo.spam("hello")
-print foo.spam("hello")
+foo.spam(1)
+foo.spam(1,1)
+foo.spam(1,1,1)
 
-foo = extend_placement.Foo(1)
+
-print type(foo)
+bar = extend_placement.Bar()
+bar = extend_placement.Bar(1)
+bar.spam()
+bar.spam("hello")
+bar.spam(1)
+bar.spam(1,1)
+bar.spam(1,1,1)
+
+
+foo = extend_placement.FooTi()
+foo = extend_placement.FooTi(1)
+foo.spam()
+foo.spam("hello")
+foo.spam(1)
+foo.spam(1,1)
+foo.spam(1,1,1)
+
+
+bar = extend_placement.BarTi()
+bar = extend_placement.BarTi(1)
+bar.spam()
+bar.spam("hello")
+bar.spam(1)
+bar.spam(1,1)
+bar.spam(1,1,1)

Source/CParse/parser.y

@@ -2520,6 +2520,7 @@ cpp_class_decl  :
 		 Setattr($$,"allows_typedef","1");
 		 /* Check for pure-abstract class */
 		 Setattr($$,"abstract", pure_abstract($7));
+		 appendChild($$,$7);
 		 
 		 /* This bit of code merges in a previously defined %extend directive (if any) */
 		 if (extendhash) {
@@ -2535,7 +2536,6 @@ cpp_class_decl  :
 		 if (!classes) classes = NewHash();
 		 Setattr(classes,Swig_symbol_qualifiedscopename(0),$$);
 
-		 appendChild($$,$7);
 		 p = $9;
 		 if (p) {
 		   set_nextSibling($$,p);