Fix typemap matching to expand template parameters when the name contains template parameters.

In the %typemap below the type is T and the name is X<T>::make
which now expands correctly to X< int >::make

template<typename T> struct X {
  %typemap(out) T X<T>::make "..."
  T make();
};

%template(Xint) X<int>;

Examples/test-suite/common.mk

@@ -522,6 +522,7 @@ CPP_TEST_CASES += \
 	typemap_numinputs \
 	typemap_template \
 	typemap_template_parm_typedef \
+	typemap_template_parms \
 	typemap_template_typedef \
 	typemap_out_optimal \
 	typemap_qualifier_strip \

Examples/test-suite/java/typemap_template_parms_runme.java

@@ -0,0 +1,23 @@
+import typemap_template_parms.*;
+
+public class typemap_template_parms_runme {
+
+  static {
+    try {
+	System.loadLibrary("typemap_template_parms");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    Xint xint = new Xint();
+    int i = 0;
+    i = xint.bake();
+    i = xint.make();
+    i = xint.lake();
+    i = xint.rake();
+    i = xint.take();
+  }
+}

Examples/test-suite/typemap_template_parms.i

@@ -0,0 +1,28 @@
+%module typemap_template_parms
+
+%typemap(ret) int "_this_will_not_compile_int_$symname"
+
+%extend X {
+%typemap(ret) T lake "/* ret lake X<T> */"
+%typemap(ret) T X<T>::rake "/* ret rake X<T> */"
+
+// Overrides below: %typemap(ret) T take
+%typemap(ret) T X<T>::take "/* ret take X<T> */"
+}
+
+%inline %{
+template<typename T> struct X {
+#if defined(SWIG)
+%typemap(ret) T bake "/* ret bake X<T> */"
+%typemap(ret) T X<T>::make "/* ret make X<T> */"
+%typemap(ret) T take "_rake_T_this_will_not_compile_"
+#endif
+  T bake() { return T(); }
+  T make() { return T(); }
+  T lake() { return T(); }
+  T rake() { return T(); }
+  T take() { return T(); }
+};
+%}
+
+%template(Xint) X<int>;