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

Director fixes for methods returning enums and references contributed by Scott Michel

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5326 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2003-11-16 17:05:40 +00:00
commit fac1ef0de3
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/Modules/java.cxx
View file

@ -2538,6 +2538,7 @@ class JAVA : public Language {
Wrapper *w = NewWrapper(); Wrapper *w = NewWrapper();
ParmList *l = Getattr(n, "parms"); ParmList *l = Getattr(n, "parms");
bool is_void = !(Cmp(type, "void")); bool is_void = !(Cmp(type, "void"));
String *qualified_return = NewString("");
bool pure_virtual = (!(Cmp(storage, "virtual")) && !(Cmp(value, "0"))); bool pure_virtual = (!(Cmp(storage, "virtual")) && !(Cmp(value, "0")));
int status = SWIG_OK; int status = SWIG_OK;
@ -2587,6 +2588,7 @@ class JAVA : public Language {
Delete(f); Delete(f);
Delete(t); Delete(t);
qualified_return = SwigType_rcaststr(return_type, "result");
if (!SwigType_isclass(return_type)) { if (!SwigType_isclass(return_type)) {
if (!(SwigType_ispointer(return_type) || SwigType_isreference(return_type))) { if (!(SwigType_ispointer(return_type) || SwigType_isreference(return_type))) {
Wrapper_add_localv(w, "result", SwigType_lstr(return_type, "result"), NIL); Wrapper_add_localv(w, "result", SwigType_lstr(return_type, "result"), NIL);
@ -2725,7 +2727,7 @@ class JAVA : public Language {
/* Make sure that we return something in the case of a pure /* Make sure that we return something in the case of a pure
* virtual method call for syntactical reasons. */ * virtual method call for syntactical reasons. */
if (!is_void) if (!is_void)
Printf(w->code, "return result;\n"); Printf(w->code, "return %s;", qualified_return);
else else
Printf(w->code, "return;\n"); Printf(w->code, "return;\n");
} }
@ -3000,14 +3002,14 @@ class JAVA : public Language {
/* Terminate wrapper code */ /* Terminate wrapper code */
if (!is_void) if (!is_void)
Printf(w->code, "return result;\n"); Printf(w->code, "return %s;", qualified_return);
Printf(w->code, "}"); Printf(w->code, "}");
/* emit code */ /* emit code */
if (status == SWIG_OK && output_director) { if (status == SWIG_OK && output_director) {
if(!is_void) { if(!is_void) {
Replaceall(w->code,"$null", "result"); Replaceall(w->code,"$null", qualified_return);
} else } else
Replaceall(w->code,"$null",""); Replaceall(w->code,"$null","");
Wrapper_print(w, f_directors); Wrapper_print(w, f_directors);
@ -3015,6 +3017,7 @@ class JAVA : public Language {
Printv(f_directors_h, declaration, NIL); Printv(f_directors_h, declaration, NIL);
} }
Delete(qualified_return);
Delete(jnidesc); Delete(jnidesc);
Delete(jniret_type); Delete(jniret_type);
Delete(jniret_desc); Delete(jniret_desc);