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

%ignore and virtual director methods fix - problem reported by Roy Sutton

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@9471 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2006-10-21 23:40:28 +00:00
commit 7d7a9a387e
5 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Source/Modules/csharp.cxx
View file

@ -3144,6 +3144,7 @@ class CSHARP : public Language {
String *super_call = Swig_method_call(super, l); String *super_call = Swig_method_call(super, l);
if (is_void) { if (is_void) {
Printf(w->code, "%s;\n", super_call); Printf(w->code, "%s;\n", super_call);
if (!ignored_method)
Printf(w->code, "return;\n"); Printf(w->code, "return;\n");
} else { } else {
Printf(w->code, "return %s;\n", super_call); Printf(w->code, "return %s;\n", super_call);

2
Source/Modules/java.cxx
View file

@ -3207,6 +3207,7 @@ class JAVA : public Language {
String *super_call = Swig_method_call(super, l); String *super_call = Swig_method_call(super, l);
if (is_void) { if (is_void) {
Printf(w->code, "%s;\n", super_call); Printf(w->code, "%s;\n", super_call);
if (!ignored_method)
Printf(w->code, "return;\n"); Printf(w->code, "return;\n");
} else { } else {
Printf(w->code, "return %s;\n", super_call); Printf(w->code, "return %s;\n", super_call);
@ -3221,6 +3222,7 @@ class JAVA : public Language {
if (!is_void) if (!is_void)
Printf(w->code, "return %s;", qualified_return); Printf(w->code, "return %s;", qualified_return);
else else
if (!ignored_method)
Printf(w->code, "return;\n"); Printf(w->code, "return;\n");
} }

2
Source/Modules/ocaml.cxx
View file

@ -1565,7 +1565,7 @@ public:
if (ignored_method) { if (ignored_method) {
if (!pure_virtual) { if (!pure_virtual) {
if (is_void) if (!is_void)
Printf(w->code, "return "); Printf(w->code, "return ");
String *super_call = Swig_method_call(super, l); String *super_call = Swig_method_call(super, l);
Printf(w->code, "%s;\n", super_call); Printf(w->code, "%s;\n", super_call);

2
Source/Modules/python.cxx
View file

@ -3457,7 +3457,7 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) {
if (ignored_method) { if (ignored_method) {
if (!pure_virtual) { if (!pure_virtual) {
if (is_void) if (!is_void)
Printf(w->code, "return "); Printf(w->code, "return ");
String *super_call = Swig_method_call(super, l); String *super_call = Swig_method_call(super, l);
Printf(w->code, "%s;\n", super_call); Printf(w->code, "%s;\n", super_call);

2
Source/Modules/ruby.cxx
View file

@ -2403,7 +2403,7 @@ public:
if (ignored_method) { if (ignored_method) {
if (!pure_virtual) { if (!pure_virtual) {
if (is_void) if (!is_void)
Printf(w->code, "return "); Printf(w->code, "return ");
String *super_call = Swig_method_call(super, l); String *super_call = Swig_method_call(super, l);
Printf(w->code, "%s;\n", super_call); Printf(w->code, "%s;\n", super_call);