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

Bug fix for when a base class has the same name as a method in a derived class.

Browse source 
Fixes for when access changes from protected to public (-fvirtual and override/hides attributes)


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7260 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2005-06-09 18:38:52 +00:00
commit 3ed206ebd0
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
SWIG/Source/Modules/allocate.cxx
View file

@ -63,7 +63,8 @@ class Allocate : public Dispatcher {
int extendmode; int extendmode;
/* Checks if a function, n, is the same as any in the base class, ie if the method is polymorphic. /* Checks if a function, n, is the same as any in the base class, ie if the method is polymorphic.
* Also checks for methods which will be hidden (ie a base has an identical non-virtual method). */ * Also checks for methods which will be hidden (ie a base has an identical non-virtual method).
* Both methods must have public access for a match to occur. */
int function_is_defined_in_bases(Node *n, Node *bases) { int function_is_defined_in_bases(Node *n, Node *bases) {
if (!bases) if (!bases)
@ -122,13 +123,14 @@ class Allocate : public Dispatcher {
return 0; return 0;
} }
/* Helper function for function_is_defined_in_bases */
int function_is_defined_in_bases_seek(Node *n, Node *b, Node *base, String *this_decl, String *name, String *this_type, String *resolved_decl) { int function_is_defined_in_bases_seek(Node *n, Node *b, Node *base, String *this_decl, String *name, String *this_type, String *resolved_decl) {
String *base_decl = Getattr(base, "decl"); String *base_decl = Getattr(base, "decl");
SwigType *base_type = Getattr(base, "type"); SwigType *base_type = Getattr(base, "type");
if (base_decl && base_type) { if (base_decl && base_type) {
if (checkAttribute(base, "name", name) && !Getattr(b, "feature:ignore") /* whole class is ignored */ ) { if (checkAttribute(base, "name", name) && !Getattr(b, "feature:ignore") /* whole class is ignored */ ) {
if (SwigType_isfunction(resolved_decl)) { if (SwigType_isfunction(resolved_decl) && SwigType_isfunction(base_decl)) {
// We have found a method that has the same name as one in a base class // We have found a method that has the same name as one in a base class
bool covariant_returntype = false; bool covariant_returntype = false;
bool returntype_match = Strcmp(base_type, this_type) == 0 ? true : false; bool returntype_match = Strcmp(base_type, this_type) == 0 ? true : false;
@ -203,9 +205,10 @@ class Allocate : public Dispatcher {
if (!most_base_covariant_type) { if (!most_base_covariant_type) {
// Eliminate the derived virtual method. // Eliminate the derived virtual method.
if (virtual_elimination_mode) { if (virtual_elimination_mode)
Setattr(n,"feature:ignore", "1"); if (both_have_public_access)
} if (!is_non_public_base(inclass, b))
Setattr(n,"feature:ignore", "1");
} else { } else {
// Some languages need to know about covariant return types // Some languages need to know about covariant return types
Setattr(n, "covariant", most_base_covariant_type); Setattr(n, "covariant", most_base_covariant_type);
@ -217,7 +220,8 @@ class Allocate : public Dispatcher {
if (!is_non_public_base(inclass, b)) if (!is_non_public_base(inclass, b))
Setattr(n, "hides", base); Setattr(n, "hides", base);
} }
return 1; if (both_have_public_access)
return 1;
} }
} }
} }