Fix Python compile errors with overloading and varargs

Fixes wrapping overloaded functions/constructors where a vararg
function is declared after a non-vararg function.
This is a long standing bug in the Python layer exposed since fastunpack
was turned on by default.

Examples/test-suite/go/varargs_overload_runme.go

@@ -35,4 +35,40 @@ func main() {
 	if varargs_overload.Vararg_over4("Hello", 123) != "Hello" {
 		panic(8)
 	}
+
+
+        // Same as above but non-vararg function declared first
+
+	if varargs_overload.Vararg_over6("Hello") != "Hello" {
+		panic(0)
+	}
+	if varargs_overload.Vararg_over6(2) != "2" {
+		panic(1)
+	}
+
+	if varargs_overload.Vararg_over7("Hello") != "Hello" {
+		panic(2)
+	}
+	if varargs_overload.Vararg_over7(2, 2.2) != "2 2.2" {
+		panic(3)
+	}
+
+	if varargs_overload.Vararg_over8("Hello") != "Hello" {
+		panic(4)
+	}
+	if varargs_overload.Vararg_over8(2, 2.2, "hey") != "2 2.2 hey" {
+		panic(5)
+	}
+
+	if varargs_overload.Vararg_over9("Hello") != "Hello" {
+		panic(6)
+	}
+
+	if varargs_overload.Vararg_over9(123) != "123" {
+		panic(7)
+	}
+
+	if varargs_overload.Vararg_over9("Hello", 123) != "Hello" {
+		panic(8)
+	}
 }

Examples/test-suite/ocaml/varargs_overload_runme.ml

@@ -11,5 +11,19 @@ let _ =
   assert (_vararg_over3 '(2, 2.2, "hey") as string = "2 2.2 hey");
   assert (_vararg_over4 '("Hello") as string = "Hello");
   assert (_vararg_over4 '(123) as string = "123");
-  assert (_vararg_over4 '("Hello", 123) as string = "Hello")
+  assert (_vararg_over4 '("Hello", 123) as string = "Hello");
+
+
+  (* Same as above but non-vararg function declared first *)
+
+  assert (_vararg_over6 '("Hello") as string = "Hello");
+  assert (_vararg_over6 '(2) as string = "2");
+  assert (_vararg_over7 '("Hello") as string = "Hello");
+  assert (_vararg_over7 '(2, 2.2) as string = "2 2.2");
+
+  assert (_vararg_over8 '("Hello") as string = "Hello");
+  assert (_vararg_over8 '(2, 2.2, "hey") as string = "2 2.2 hey");
+  assert (_vararg_over9 '("Hello") as string = "Hello");
+  assert (_vararg_over9 '(123) as string = "123");
+  assert (_vararg_over9 '("Hello", 123) as string = "Hello");
 ;;

Examples/test-suite/python/varargs_overload_runme.py

@@ -28,3 +28,35 @@ if varargs_overload.vararg_over4(123) != "123":
 
 if varargs_overload.vararg_over4("Hello", 123) != "Hello":
     raise RuntimeError, "Failed"
+
+
+# Same as above but non-vararg function declared first
+
+if varargs_overload.vararg_over6("Hello") != "Hello":
+    raise RuntimeError, "Failed"
+
+if varargs_overload.vararg_over6(2) != "2":
+    raise RuntimeError, "Failed"
+
+
+if varargs_overload.vararg_over7("Hello") != "Hello":
+    raise RuntimeError, "Failed"
+
+if varargs_overload.vararg_over7(2, 2.2) != "2 2.2":
+    raise RuntimeError, "Failed"
+
+
+if varargs_overload.vararg_over8("Hello") != "Hello":
+    raise RuntimeError, "Failed"
+
+if varargs_overload.vararg_over8(2, 2.2, "hey") != "2 2.2 hey":
+    raise RuntimeError, "Failed"
+
+if varargs_overload.vararg_over9("Hello") != "Hello":
+    raise RuntimeError, "Failed"
+
+if varargs_overload.vararg_over9(123) != "123":
+    raise RuntimeError, "Failed"
+
+if varargs_overload.vararg_over9("Hello", 123) != "Hello":
+    raise RuntimeError, "Failed"

Examples/test-suite/scilab/varargs_overload_runme.sci

@@ -4,7 +4,7 @@ checkequal(vararg_over1("Hello"), "Hello", "vararg_over1(""Hello"")");
 
 checkequal(vararg_over1(2), "2", "vararg_over1(2)");
 
-checkequal(vararg_over2("Hello"), "Hello", "vararg_over1(""Hello"")");
+checkequal(vararg_over2("Hello"), "Hello", "vararg_over2(""Hello"")");
 
 checkequal(vararg_over2(2, 2.2), "2 2.2", "vararg_over2(2, 2.2)")
 
@@ -18,4 +18,24 @@ checkequal(vararg_over4(123), "123", "vararg_over4(123)");
 
 checkequal(vararg_over4("Hello", 123), "Hello", "vararg_over4(""Hello"", 123)");
 
+
+// Same as above but non-vararg function declared first
+
+checkequal(vararg_over6("Hello"), "Hello", "vararg_over6(""Hello"")");
+
+checkequal(vararg_over6(2), "2", "vararg_over6(2)");
+
+checkequal(vararg_over7("Hello"), "Hello", "vararg_over7(""Hello"")");
+
+checkequal(vararg_over7(2, 2.2), "2 2.2", "vararg_over7(2, 2.2)")
+
+checkequal(vararg_over8("Hello"), "Hello", "vararg_over8(""Hello"")");
+
+checkequal(vararg_over8(2, 2.2, "hey"), "2 2.2 hey", "vararg_over8(2, 2.2, ""hey"")");
+
+checkequal(vararg_over9("Hello"), "Hello", "vararg_over9(""Hello"")");
+
+checkequal(vararg_over9(123), "123", "vararg_over9(123)");
+
+checkequal(vararg_over9("Hello", 123), "Hello", "vararg_over9(""Hello"", 123)");
 exec("swigtest.quit", -1);

Examples/test-suite/varargs_overload.i

@@ -44,3 +44,47 @@ const char *vararg_over4(int i) {
   return buffer;
 }
 %}
+
+
+// Same as above but non-vararg function declared first
+
+%inline %{
+const char *vararg_over6(int i) {
+  static char buffer[256];
+  sprintf(buffer, "%d", i);
+  return buffer;
+}
+const char *vararg_over6(const char *fmt, ...) {
+  return fmt;
+}
+
+const char *vararg_over7(int i, double j) {
+  static char buffer[256];
+  sprintf(buffer, "%d %g", i, j);
+  return buffer;
+}
+const char *vararg_over7(const char *fmt, ...) {
+  return fmt;
+}
+
+const char *vararg_over8(int i, double j, const char *s) {
+  static char buffer[256];
+  sprintf(buffer, "%d %g %s", i, j, s);
+  return buffer;
+}
+const char *vararg_over8(const char *fmt, ...) {
+  return fmt;
+}
+%}
+
+%varargs(int mode = 0) vararg_over9;
+%inline %{
+const char *vararg_over9(int i) {
+  static char buffer[256];
+  sprintf(buffer, "%d", i);
+  return buffer;
+}
+const char *vararg_over9(const char *fmt, ...) {
+  return fmt;
+}
+%}