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

director enum fixes from Scott Michel

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6035 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2004-07-12 19:46:45 +00:00
commit 5e5ba98ffd
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3114,14 +3114,12 @@ class JAVA : public Language {
* intermediate's upcall code */
if ((tm = Getattr(p, "tmap:jtype")) != NULL) {
String *din;
Node *canon_node = canonicalizeType(n, pt);
String *canon_type = (canon_node ? Getattr(canon_node, "sym:name") : pt);
din = Copy(Getattr(p, "tmap:javadirectorin"));
if (din != NULL) {
Replaceall(din, "$module", module_class_name);
Replaceall(din, "$javaclassname", canon_type);
substituteClassname(pt, din);
Replaceall(din, "$jniinput", ln);
Printf(imw->def, ", %s %s", tm, ln);
@ -3238,12 +3236,10 @@ class JAVA : public Language {
if (!is_void) {
Parm *tp = NewParm(return_type, empty_str);
String *base_type = SwigType_base(return_type);
Node *canon_node = canonicalizeType(n, return_type);
String *canon_type = (canon_node ? Getattr(canon_node, "sym:name") : base_type);
tm = Swig_typemap_lookup_new("javadirectorout", tp, "", 0);
if (tm != NULL) {
Replaceall(tm, "$javaclassname", canon_type);
substituteClassname(base_type, tm);
Replaceall(tm, "$javacall", upcall);
Printf(imw->code, "return %s;\n", tm);