fix typemap + numinputs +argout

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

SWIG/Examples/test-suite/common.mk

@@ -266,6 +266,7 @@ CPP_TEST_CASES += \
 	typedef_scope \
 	typemap_namespace \
 	typemap_ns_using \
+	typemap_numinputs \
 	typename \
 	union_scope \
 	using1 \

SWIG/Examples/test-suite/typemap_numinputs.i

@@ -0,0 +1,37 @@
+%module typemap_numinputs
+
+
+%typemap(in, numinputs=1) (char *STR, int LEN)(int temp = 0)
+{
+  temp = 1;
+  $2 = 0;
+  $1 = 0;
+}
+
+%typemap(in) (int *OUTPUT)  (int temp = 0)
+{
+  temp = 2;
+  $1 = &temp;
+}
+
+%typemap(argout) (int *OUTPUT)
+{
+  temp$argnum;
+}
+
+%typemap(argout, numinputs=1) (char *STR, int LEN)
+{
+  temp$argnum;
+}
+
+%typemap(in) int hello
+{
+  $1 = 0;
+}
+
+%inline %{
+  int this_breaks(int hello, char *STR, int LEN, int *OUTPUT)
+  {
+    return LEN;
+  }
+%}

SWIG/Source/Swig/typemap.c

@@ -1418,6 +1418,9 @@ Swig_typemap_attach_parms(const String_or_char *op, ParmList *parms, Wrapper *f)
 
     /* Look for code fragments */
     Swig_typemap_emit_code_fragments(op,firstp);
+
+    /* increase argnum to consider numinputs */
+    argnum += nmatch - 1;
   }
 }