improved warning code
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11482 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
bbcfa0b089
commit
43da669254
1 changed files with 3 additions and 25 deletions
|
|
@ -881,30 +881,8 @@ int Language::cDeclaration(Node *n) {
|
|||
if (over)
|
||||
over = first_nontemplate(over);
|
||||
if (over && (over != n)) {
|
||||
SwigType *tc = Copy(decl);
|
||||
SwigType *td = SwigType_pop_function(tc);
|
||||
String *oname;
|
||||
String *cname;
|
||||
if (CurrentClass) {
|
||||
oname = NewStringf("%s::%s", ClassName, name);
|
||||
cname = NewStringf("%s::%s", ClassName, Getattr(over, "name"));
|
||||
} else {
|
||||
oname = NewString(name);
|
||||
cname = NewString(Getattr(over, "name"));
|
||||
}
|
||||
|
||||
SwigType *tc2 = Copy(Getattr(over, "decl"));
|
||||
SwigType *td2 = SwigType_pop_function(tc2);
|
||||
|
||||
Swig_warning(WARN_LANG_OVERLOAD_DECL, input_file, line_number, "Overloaded declaration ignored. %s\n", SwigType_str(td, SwigType_namestr(oname)));
|
||||
Swig_warning(WARN_LANG_OVERLOAD_DECL, Getfile(over), Getline(over), "Previous declaration is %s\n", SwigType_str(td2, SwigType_namestr(cname)));
|
||||
|
||||
Delete(tc2);
|
||||
Delete(td2);
|
||||
Delete(tc);
|
||||
Delete(td);
|
||||
Delete(oname);
|
||||
Delete(cname);
|
||||
Swig_warning(WARN_LANG_OVERLOAD_DECL, input_file, line_number, "Overloaded declaration ignored. %s\n", Swig_name_decl(n));
|
||||
Swig_warning(WARN_LANG_OVERLOAD_DECL, Getfile(over), Getline(over), "Previous declaration is %s\n", Swig_name_decl(over));
|
||||
return SWIG_NOWRAP;
|
||||
}
|
||||
}
|
||||
|
|
@ -985,7 +963,7 @@ int Language::cDeclaration(Node *n) {
|
|||
if (Strncmp(symname, "__dummy_", 8) == 0) {
|
||||
SetFlag(n, "feature:ignore");
|
||||
Swig_warning(WARN_LANG_TEMPLATE_METHOD_IGNORE, input_file, line_number,
|
||||
"%%template() contains no name. Template method ignored: %s\n", SwigType_str(decl, SwigType_namestr(Getattr(n,"name"))));
|
||||
"%%template() contains no name. Template method ignored: %s\n", Swig_name_decl(n));
|
||||
}
|
||||
}
|
||||
if (!GetFlag(n, "feature:ignore"))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue