Ensure the premature garbage collection prevention parameter (pgcpp) is generated for Java wrappers

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

Source/Modules/java.cxx

@@ -800,6 +800,7 @@ public:
     /* Attach the non-standard typemaps to the parameter list. */
     Swig_typemap_attach_parms("jni", l, f);
     Swig_typemap_attach_parms("jtype", l, f);
+    Swig_typemap_attach_parms("jstype", l, f);
 
     /* Get return types */
     if ((tm = Swig_typemap_lookup_new("jni", n, "", 0))) {
@@ -892,6 +893,12 @@ public:
       // Premature garbage collection prevention parameter
       if (!is_destructor) {
 	String *pgc_parameter = prematureGarbageCollectionPreventionParameter(pt, p);
+        /*
+        if (!pgc_parameter) {
+          Printf(stdout, "prematuregcp %s %s [%s]\n", symname, Getattr(n, "sym:overname"), pt);
+          Swig_print_node(p);
+        }
+        */
 	if (pgc_parameter) {
 	  Printf(imclass_class_code, ", %s %s_", pgc_parameter, arg);
 	  Printf(f->def, ", jobject %s_", arg);
@@ -1943,6 +1950,7 @@ public:
       SwigType_add_pointer(this_type);
       Parm *this_parm = NewParm(this_type, name);
       Swig_typemap_attach_parms("jtype", this_parm, NULL);
+      Swig_typemap_attach_parms("jstype", this_parm, NULL);
 
       if (prematureGarbageCollectionPreventionParameter(this_type, this_parm))
 	Printf(imcall, ", this");
@@ -2916,16 +2924,50 @@ public:
    * ----------------------------------------------------------------------------- */
 
   String *prematureGarbageCollectionPreventionParameter(SwigType *t, Parm *p) {
-    String *jtype = Getattr(p, "tmap:jtype");
+    String *proxyClassName = 0;
+    String *jtype = NewString(Getattr(p, "tmap:jtype"));
+    // TODO: remove any C comments from jtype
+    // remove whitespace
+    Replaceall(jtype, " ", "");
+    Replaceall(jtype, "\t", "");
+
     if (Cmp(jtype, "long") == 0) {
       if (proxy_flag) {
-	Node *n = classLookup(t);
-	if (n && !GetFlag(p, "tmap:jtype:nopgcpp") && !nopgcpp_flag) {
-	  return Getattr(n, "sym:name");
+	if (!GetFlag(p, "tmap:jtype:nopgcpp") && !nopgcpp_flag) {
+          Node *n = classLookup(t);
+          if (n) {
+            // Found a struct/class parameter passed by value, reference, pointer, or pointer reference
+            proxyClassName = Getattr(n, "sym:name");
+          } else {
+            // Look for proxy class parameters passed to C++ layer using non-default typemaps, ie not one of above types
+            String *jstype = NewString(Getattr(p, "tmap:jstype"));
+            if (jstype) {
+              Hash *classes = getClassHash();
+              if (classes) {
+                // TODO: remove any C comments from jstype
+                // remove whitespace
+                Replaceall(jstype, " ", "");
+                Replaceall(jstype, "\t", "");
+
+                Iterator ki;
+                for (ki = First(classes); ki.key; ki = Next(ki)) {
+                  Node *cls = ki.item;
+                  if (cls && !Getattr(cls, "feature:ignore")) {
+                    String *symname = Getattr(cls, "sym:name");
+                    if (symname && Strcmp(symname, jstype) == 0) {
+                      proxyClassName = symname;
+                    }
+                  }
+                }
+              }
+            }
+            Delete(jstype);
+          }
 	}
       }
     }
-    return NULL;
+    Delete(jtype);
+    return proxyClassName;
   }
 
   /*----------------------------------------------------------------------

Source/Modules/lang.cxx

@@ -2932,12 +2932,14 @@ Node *Language::classLookup(SwigType *s) {
   n = Getattr(classtypes, s);
   if (!n) {
     Symtab *stab = 0;
-    SwigType *lt = SwigType_ltype(s);
-    SwigType *ty1 = SwigType_typedef_resolve_all(lt);
+//    SwigType *lt = SwigType_ltype(s);
+//    SwigType *ty1 = SwigType_typedef_resolve_all(lt);
+    SwigType *ty1 = SwigType_typedef_resolve_all(s);
     SwigType *ty2 = SwigType_strip_qualifiers(ty1);
-    Delete(lt);
+//    Printf(stdout, "   stages... ty1: %s ty2: %s\n", ty1, ty2);
+//    Delete(lt);
     Delete(ty1);
-    lt = 0;
+//    lt = 0;
     ty1 = 0;
 
     String *base = SwigType_base(ty2);
@@ -2968,10 +2970,12 @@ Node *Language::classLookup(SwigType *s) {
     }
     if (n) {
       /* Found a match.  Look at the prefix.  We only allow
-         a few cases: pointers, references, and simple */
-      if ((Len(prefix) == 0) ||	/* Simple type */
-	  (Strcmp(prefix, "p.") == 0) ||	/* pointer     */
-	  (Strcmp(prefix, "r.") == 0)) {	/* reference   */
+         the cases where where we want a proxy class for the particular type */
+      if ((Len(prefix) == 0) ||	                // simple type (pass by value)
+	  (Strcmp(prefix, "p.") == 0) ||	// pointer
+	  (Strcmp(prefix, "r.") == 0) ||	// reference
+	  (Strcmp(prefix, "r.p.") == 0) || 	// pointer by reference
+          SwigType_prefix_is_simple_1D_array(prefix)) { // Simple 1D array (not arrays of pointers/references)
 	SwigType *cs = Copy(s);
 	Setattr(classtypes, cs, n);
 	Delete(cs);
@@ -3356,3 +3360,7 @@ String *Language::runtimeCode() {
 String *Language::defaultExternalRuntimeFilename() {
   return 0;
 }
+
+Hash *Language::getClassHash() const {
+  return classhash;
+}

Source/Modules/swigmod.h

@@ -259,6 +259,9 @@ protected:
   /* Return the real name of the current class */
   String *getClassName() const;
 
+  /* Return the classes hash */
+  Hash *getClassHash() const;
+
   /* Return the current class prefix */
   String *getClassPrefix() const;