c41374becc
%inline %{
class Foo {
protected:
void x();
public:
void y();
};
%}
will work in plain or plain director mode, but it will complain the
same as before with director protected support.
The reason is that the parser emmits the warning, and at that stage it
is not possible to decide if the protected Foo::x() could or not
conflict with the renamed Foo::y(), since Foo::x() could be virtual,
even when no "virtual" attribute is used.
Core:
parser.y: Detect the dirprot mode and prevents the generation of
protected symbols at the parsing stage.
lang.cxx: Export the director_protected_mode for parser.y and the
director protected member detection is much cleaner.
main.cxx: Fix the -dirprot flag, it was working in SWIG_FEATURE but
not in the command line.(minor thing not relate to the error).
swigmod.h: added Lang::dirprot_mode() for cleaner detection.
utils.cxx: is_member_director() centralizes and improve the test.
Test suite:
protected_rename.i: added %inline, so it can compile now.
director_protected.i: more cases, checking using %rename.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5530 626c5289-ae23-0410-ae9c-e8d60b6d4f22
38 lines
986 B
C++
38 lines
986 B
C++
|
|
#include <swigmod.h>
|
|
|
|
int is_public(Node* n)
|
|
{
|
|
String* access = Getattr(n, "access");
|
|
return !access || !Cmp(access, "public");
|
|
}
|
|
|
|
int is_private(Node* n)
|
|
{
|
|
String* access = Getattr(n, "access");
|
|
return access && !Cmp(access, "private");
|
|
}
|
|
|
|
int is_protected(Node* n)
|
|
{
|
|
String* access = Getattr(n, "access");
|
|
return access && !Cmp(access, "protected");
|
|
}
|
|
|
|
int is_member_director(Node* parentnode, Node* member)
|
|
{
|
|
if (checkAttribute(member,"director","1")) return 1;
|
|
if (parentnode && checkAttribute(member, "storage", "virtual")) {
|
|
int parent_director = checkAttribute(parentnode,"feature:director","1");
|
|
int cdecl_director = parent_director || checkAttribute(member,"feature:director","1");
|
|
int cdecl_nodirector = checkAttribute(member,"feature:nodirector","1");
|
|
return cdecl_director && !cdecl_nodirector;
|
|
} else {
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
int is_member_director(Node* member)
|
|
{
|
|
return is_member_director(Getattr(member, "parentNode"), member);
|
|
}
|