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

better fix for virtual_mode + protected case

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6371 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-10-07 22:15:23 +00:00
commit 785190bbf1
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/Modules/allocate.cxx
View file

@ -67,8 +67,8 @@ class Allocate : public Dispatcher {
/* Checks if a virtual function is the same as inherited from the bases */ /* Checks if a virtual function is the same as inherited from the bases */
int function_is_defined_in_bases(Node *c, Node *bases) { int function_is_defined_in_bases(Node *c, Node *bases) {
Node *b, *temp; Node *b, *temp;
String *name, *type, *local_decl, *base_decl; String *name, *type, *local_decl, *base_decl, *base_access;
SwigType *base_type, *local_type; SwigType *base_type, *local_type, *local_access;
if (!bases) if (!bases)
return 0; return 0;
@ -76,6 +76,7 @@ class Allocate : public Dispatcher {
name = Getattr(c, "name"); name = Getattr(c, "name");
type = Getattr(c, "type"); type = Getattr(c, "type");
local_decl = Getattr(c, "decl"); local_decl = Getattr(c, "decl");
local_access = Getattr(c, "access");
if (local_decl) { if (local_decl) {
local_decl = SwigType_typedef_resolve_all(local_decl); local_decl = SwigType_typedef_resolve_all(local_decl);
} else { } else {
@ -90,6 +91,7 @@ class Allocate : public Dispatcher {
while (temp) { while (temp) {
base_decl = Getattr(temp, "decl"); base_decl = Getattr(temp, "decl");
base_type = Getattr(temp, "type"); base_type = Getattr(temp, "type");
base_access = Getattr(temp, "access");
if (base_decl && base_type) { if (base_decl && base_type) {
base_decl = SwigType_typedef_resolve_all(base_decl); base_decl = SwigType_typedef_resolve_all(base_decl);
base_type = SwigType_typedef_resolve_all(base_type); base_type = SwigType_typedef_resolve_all(base_type);
@ -103,18 +105,22 @@ class Allocate : public Dispatcher {
// is, not the virtual method definition in a base class // is, not the virtual method definition in a base class
Setattr(c, "storage", "virtual"); Setattr(c, "storage", "virtual");
Setattr(c, "virtual:derived", "1"); Setattr(c, "virtual:derived", "1");
if ((Strcmp(local_type, base_type) == 0) && is_public(c)) { if ((Strcmp(local_type, base_type) == 0)) {
// if the types are the same, then we can attemp // if the types and access are the same, then we can attemp
// to eliminate the derived virtual method. // to eliminate the derived virtual method.
if (virtual_elimination_mode) Setattr(c,"feature:ignore", "1"); if (virtual_elimination_mode) {
const char *la = local_access ? Char(local_access) : "";
const char *ba = base_access ? Char(base_access) : "";
if (strcmp(la, ba) == 0) Setattr(c,"feature:ignore", "1");
}
} else { } else {
// if the types are different, we record the original // if the types are different, we record the original
// virtual base type in case some language needs it. // virtual base type in case some language needs it.
Setattr(c, "virtual:type", Getattr(temp, "type")); Setattr(c, "virtual:type", Getattr(temp, "type"));
} }
Delete(base_decl); Delete(base_decl);
Delete(base_type); Delete(base_type);
Delete(local_decl); Delete(local_decl);
Delete(local_type); Delete(local_type);
return 1; return 1;