jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small tweak to canonicalizeJNIDescriptor()

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6843 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2004-12-07 23:24:13 +00:00
commit f91144e004
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
SWIG/Source/Modules/java.cxx
View file

@ -2784,9 +2784,9 @@ class JAVA : public Language {
* *
* --------------------------------------------------------------- */ * --------------------------------------------------------------- */
String *canonicalizeJNIDescriptor(String *descriptor_in, SwigType *type) { String *canonicalizeJNIDescriptor(String *descriptor_in, Parm *p) {
Parm *tp = NewParm(type, ""); String *pkg_path = Swig_typemap_lookup_new("javapackage", p, "", 0);
String *pkg_path = Swig_typemap_lookup_new("javapackage", tp, "", 0); SwigType *type = Getattr(p,"type");
if (pkg_path && Len(pkg_path) != 0) { if (pkg_path && Len(pkg_path) != 0) {
Replaceall(pkg_path, ".", "/"); Replaceall(pkg_path, ".", "/");
@ -2806,7 +2806,6 @@ class JAVA : public Language {
if (pkg_path != package_path) if (pkg_path != package_path)
Delete(pkg_path); Delete(pkg_path);
Delete(tp);
return descriptor_out; return descriptor_out;
} }
@ -2930,7 +2929,7 @@ class JAVA : public Language {
&& (jdesc = Getattr(tp, "tmap:directorin:descriptor")) != NULL) { && (jdesc = Getattr(tp, "tmap:directorin:descriptor")) != NULL) {
String *jnidesc_canon; String *jnidesc_canon;
jnidesc_canon = canonicalizeJNIDescriptor(jdesc, Getattr(tp,"type")); jnidesc_canon = canonicalizeJNIDescriptor(jdesc, tp);
Append(jniret_desc, jnidesc_canon); Append(jniret_desc, jnidesc_canon);
Delete(jnidesc_canon); Delete(jnidesc_canon);
} else { } else {
@ -2957,7 +2956,7 @@ class JAVA : public Language {
String *jnidesc_canon; String *jnidesc_canon;
// Note that in the case of polymorphic (covariant) return types, the method's return type is changed to be the base of the C++ return type // Note that in the case of polymorphic (covariant) return types, the method's return type is changed to be the base of the C++ return type
jnidesc_canon = canonicalizeJNIDescriptor(jdesc, adjustedreturntype); jnidesc_canon = canonicalizeJNIDescriptor(jdesc, adjustedreturntypeparm);
Append(classret_desc, jnidesc_canon); Append(classret_desc, jnidesc_canon);
Delete(jnidesc_canon); Delete(jnidesc_canon);
} else { } else {
@ -3039,7 +3038,7 @@ class JAVA : public Language {
&& (jdesc = Getattr(tp, "tmap:directorin:descriptor")) != NULL) { && (jdesc = Getattr(tp, "tmap:directorin:descriptor")) != NULL) {
String *jni_canon; String *jni_canon;
jni_canon = canonicalizeJNIDescriptor(jdesc, Getattr(tp,"type")); jni_canon = canonicalizeJNIDescriptor(jdesc, tp);
Append(jnidesc, jni_canon); Append(jnidesc, jni_canon);
Delete(jni_canon); Delete(jni_canon);
Delete(tm); Delete(tm);
@ -3093,7 +3092,7 @@ class JAVA : public Language {
&& (cdesc = Getattr(p, "tmap:directorin:descriptor")) != NULL) { && (cdesc = Getattr(p, "tmap:directorin:descriptor")) != NULL) {
String *jni_canon; String *jni_canon;
jni_canon = canonicalizeJNIDescriptor(jdesc, Getattr(tp,"type")); jni_canon = canonicalizeJNIDescriptor(jdesc, tp);
Append(jnidesc, jni_canon); Append(jnidesc, jni_canon);
Delete(jni_canon); Delete(jni_canon);
@ -3125,7 +3124,7 @@ class JAVA : public Language {
} else } else
Printv(imcall_args, ln, NIL); Printv(imcall_args, ln, NIL);
jni_canon = canonicalizeJNIDescriptor(cdesc, Getattr(p,"type")); jni_canon = canonicalizeJNIDescriptor(cdesc, p);
Append(classdesc, jni_canon); Append(classdesc, jni_canon);
Delete(jni_canon); Delete(jni_canon);
} else { } else {