[Swig-cvs] SWIG/Source/Modules java.cxx,1.82,1.83

[William F. <wsf...@us...>]

Update of /cvsroot/swig/SWIG/Source/Modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7349/Source/Modules

Modified Files:
	java.cxx 
Log Message:
small tweak to canonicalizeJNIDescriptor()

Index: java.cxx
===================================================================
RCS file: /cvsroot/swig/SWIG/Source/Modules/java.cxx,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** java.cxx	7 Dec 2004 23:04:20 -0000	1.82
--- java.cxx	7 Dec 2004 23:24:13 -0000	1.83
***************
*** 2785,2791 ****
     * --------------------------------------------------------------- */
  
!   String *canonicalizeJNIDescriptor(String *descriptor_in, SwigType *type) {
!     Parm   *tp = NewParm(type, "");
!     String *pkg_path = Swig_typemap_lookup_new("javapackage", tp, "", 0);
  
      if (pkg_path && Len(pkg_path) != 0) {
--- 2785,2791 ----
     * --------------------------------------------------------------- */
  
!   String *canonicalizeJNIDescriptor(String *descriptor_in, Parm *p) {
!     String *pkg_path = Swig_typemap_lookup_new("javapackage", p, "", 0);
!     SwigType *type = Getattr(p,"type");
  
      if (pkg_path && Len(pkg_path) != 0) {
***************
*** 2807,2811 ****
      if (pkg_path != package_path)
        Delete(pkg_path);
-     Delete(tp);
  
      return descriptor_out;
--- 2807,2810 ----
***************
*** 2931,2935 ****
            String *jnidesc_canon;
  
!           jnidesc_canon = canonicalizeJNIDescriptor(jdesc, Getattr(tp,"type"));
            Append(jniret_desc, jnidesc_canon);
            Delete(jnidesc_canon);
--- 2930,2934 ----
            String *jnidesc_canon;
  
!           jnidesc_canon = canonicalizeJNIDescriptor(jdesc, tp);
            Append(jniret_desc, jnidesc_canon);
            Delete(jnidesc_canon);
***************
*** 2958,2962 ****
  
          // 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);
          Append(classret_desc, jnidesc_canon);
          Delete(jnidesc_canon);
--- 2957,2961 ----
  
          // 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, adjustedreturntypeparm);
          Append(classret_desc, jnidesc_canon);
          Delete(jnidesc_canon);
***************
*** 3040,3044 ****
          String *jni_canon;
            
!         jni_canon = canonicalizeJNIDescriptor(jdesc, Getattr(tp,"type"));
          Append(jnidesc, jni_canon);
          Delete(jni_canon);
--- 3039,3043 ----
          String *jni_canon;
            
!         jni_canon = canonicalizeJNIDescriptor(jdesc, tp);
          Append(jnidesc, jni_canon);
          Delete(jni_canon);
***************
*** 3094,3098 ****
              String *jni_canon;
            
!             jni_canon = canonicalizeJNIDescriptor(jdesc, Getattr(tp,"type"));
              Append(jnidesc, jni_canon);
              Delete(jni_canon);
--- 3093,3097 ----
              String *jni_canon;
            
!             jni_canon = canonicalizeJNIDescriptor(jdesc, tp);
              Append(jnidesc, jni_canon);
              Delete(jni_canon);
***************
*** 3126,3130 ****
                    Printv(imcall_args, ln, NIL);
  
!                 jni_canon = canonicalizeJNIDescriptor(cdesc, Getattr(p,"type"));
                  Append(classdesc, jni_canon);
                  Delete(jni_canon);
--- 3125,3129 ----
                    Printv(imcall_args, ln, NIL);
  
!                 jni_canon = canonicalizeJNIDescriptor(cdesc, p);
                  Append(classdesc, jni_canon);
                  Delete(jni_canon);