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

improved warning for abstract classes and fixed a spurious warning for smart_pointers

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5618 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-01-13 00:43:44 +00:00
commit faee816f18
2 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Examples/test-suite/smart_pointer_protected.i
View file

@ -7,6 +7,7 @@
struct A struct A
{ {
virtual int value(A*) = 0; virtual int value(A*) = 0;
int index;
}; };
struct B : A struct B : A
@ -21,6 +22,8 @@
struct C struct C
{ {
hi::B* operator->() const { return new hi::B(); } hi::B* operator->() const { return new hi::B(); }
private:
int index;
}; };
} }

31
Source/Modules/allocate.cxx
View file

@ -103,11 +103,13 @@ 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");
// record the virtual base type in case some language
// needs it
if (Strcmp(local_type, base_type) == 0) { if (Strcmp(local_type, base_type) == 0) {
// if the types are the same, then we can attemp
// to eliminate the derived virtual method.
if (virtual_elimination_mode) Setattr(c,"feature:ignore", "1"); if (virtual_elimination_mode) Setattr(c,"feature:ignore", "1");
} else { } else {
// if the types are different, we record the original
// virtual base type in case some language needs it.
Setattr(c, "virtual:type", Getattr(temp, "type")); Setattr(c, "virtual:type", Getattr(temp, "type"));
} }
@ -182,7 +184,9 @@ class Allocate : public Dispatcher {
else return 0; else return 0;
} }
/* Checks to see if a class is abstract through inheritance */ /* Checks to see if a class is abstract through inheritance,
and saves the first node that seems to be abstract.
*/
int is_abstract_inherit(Node *n, Node *base = 0, int first = 0) { int is_abstract_inherit(Node *n, Node *base = 0, int first = 0) {
if (!first && (base == n)) return 0; if (!first && (base == n)) return 0;
if (!base) { if (!base) {
@ -235,7 +239,10 @@ class Allocate : public Dispatcher {
} }
*/ */
if (!dn) return 1; if (!dn) {
Setattr(n,"abstract:firstnode",nn);
return 1;
}
/* /*
if (dn && (Getattr(dn,"abstract"))) { if (dn && (Getattr(dn,"abstract"))) {
return 1; return 1;
@ -279,9 +286,10 @@ class Allocate : public Dispatcher {
String *name = Getattr(c,"name"); String *name = Getattr(c,"name");
String *symname = Getattr(c,"sym:name"); String *symname = Getattr(c,"sym:name");
Node *e = Swig_symbol_clookup_local(name,0); Node *e = Swig_symbol_clookup_local(name,0);
if (e && !Getattr(e,"feature:ignore") && (Cmp(symname, Getattr(e,"sym:name")) == 0)) { if (e && is_public(e) && !Getattr(e,"feature:ignore") && (Cmp(symname, Getattr(e,"sym:name")) == 0)) {
Swig_warning(WARN_LANG_DEREF_SHADOW,Getfile(e),Getline(e),"Declaration of '%s' shadows declaration accessible via operator->() at %s:%d\n", Swig_warning(WARN_LANG_DEREF_SHADOW,Getfile(e),Getline(e),"Declaration of '%s' shadows declaration accessible via operator->(),\n",
name, Getfile(c),Getline(c)); name);
Swig_warning(WARN_LANG_DEREF_SHADOW,Getfile(c),Getline(c)," '%s' first declared here.\n", name);
} else { } else {
/* Make sure node with same name doesn't already exist */ /* Make sure node with same name doesn't already exist */
int k; int k;
@ -427,7 +435,14 @@ public:
if (is_abstract_inherit(n)) { if (is_abstract_inherit(n)) {
if ((!Getattr(n,"abstract")) && ((Getattr(n,"allocate:public_constructor") || (!Getattr(n,"feature:nodefault") && !Getattr(n,"allocate:has_constructor"))))) { if ((!Getattr(n,"abstract")) && ((Getattr(n,"allocate:public_constructor") || (!Getattr(n,"feature:nodefault") && !Getattr(n,"allocate:has_constructor"))))) {
if (!Getattr(n,"feature:notabstract")) { if (!Getattr(n,"feature:notabstract")) {
Swig_warning(WARN_TYPE_ABSTRACT,Getfile(n),Getline(n),"Class '%s' might be abstract. No constructors generated. \n", SwigType_namestr(Getattr(n,"name"))); Node *na = Getattr(n,"abstract:firstnode");
Swig_warning(WARN_TYPE_ABSTRACT, Getfile(n), Getline(n),
"Class '%s' might be abstract, "
"no constructors generated,\n",
SwigType_namestr(Getattr(n,"name")));
Swig_warning(WARN_TYPE_ABSTRACT, Getfile(na), Getline(na),
" method '%s' might not be implemented.",
SwigType_namestr(Getattr(na,"name")));
Setattr(n,"abstract",NewList()); Setattr(n,"abstract",NewList());
} }
} }