Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a few other means to avoid false positives

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-10-29 16:30:50 +00:00
parent de56f24082
commit 187c2f81bc
2 changed files with 72 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
utils/ifacecheck/src/ifacecheck.cpp
View File

@@ -265,10 +265,10 @@ bool IfaceCheckApp::Compare()
} }
} }
LogMessage("%d methods (%.1f%%) of the interface headers do not exist in the real headers", LogMessage("%d on a total of %d methods (%.1f%%) of the interface headers do not exist in the real headers",
mcount, (float)(100.0 * mcount/m_doxyInterface.GetMethodCount())); mcount, m_doxyInterface.GetMethodCount(), (float)(100.0 * mcount/m_doxyInterface.GetMethodCount()));
LogMessage("%d classes (%.1f%%) of the interface headers do not exist in the real headers", LogMessage("%d on a total of %d classes (%.1f%%) of the interface headers do not exist in the real headers",
ccount, (float)(100.0 * ccount/m_doxyInterface.GetClassesCount())); ccount, m_doxyInterface.GetClassesCount(), (float)(100.0 * ccount/m_doxyInterface.GetClassesCount()));
return true; return true;
} }
@@ -302,24 +302,44 @@ int IfaceCheckApp::CompareClasses(const wxClass* iface, const wxClass* api)
// search in the methods of the api classes provided // search in the methods of the api classes provided
real = api->RecursiveUpwardFindMethod(m, &m_gccInterface); real = api->RecursiveUpwardFindMethod(m, &m_gccInterface);
// // avoid some false positives:
if (!real && m.ActsAsDefaultCtor()) if (!real && m.ActsAsDefaultCtor())
{ {
// build an artifical default ctor for this class: // build an artificial default ctor for this class:
wxMethod temp(m); wxMethod temp(m);
temp.GetArgumentTypes().Clear(); temp.GetArgumentTypes().Clear();
// repeat search:
real = api->RecursiveUpwardFindMethod(temp, &m_gccInterface); real = api->RecursiveUpwardFindMethod(temp, &m_gccInterface);
} }
// no matches?
if (!real) if (!real)
{ {
bool proceed = true;
wxMethodPtrArray overloads = wxMethodPtrArray overloads =
api->RecursiveUpwardFindMethodsNamed(m.GetName(), &m_gccInterface); api->RecursiveUpwardFindMethodsNamed(m.GetName(), &m_gccInterface);
#define HACK_TO_AUTO_CORRECT_ONLY_METHOD_ATTRIBUTES 1 // avoid false positives:
for (unsigned int k=0; k<overloads.GetCount(); k++)
if (overloads[k]->MatchesExceptForAttributes(m) &&
m.IsDeprecated() && !overloads[k]->IsDeprecated())
{
// maybe the iface method is marked as deprecated but the
// real method is not?
wxMethod tmp(*overloads[k]);
tmp.SetDeprecated(true);
if (tmp == m)
{
// in this case, we can disregard this warning... the real
// method probably is included in WXWIN_COMPAT sections!
proceed = false; // skip this method
}
}
#define HACK_TO_AUTO_CORRECT_ONLY_METHOD_ATTRIBUTES 0
#if HACK_TO_AUTO_CORRECT_ONLY_METHOD_ATTRIBUTES #if HACK_TO_AUTO_CORRECT_ONLY_METHOD_ATTRIBUTES
bool exit = false;
for (unsigned int k=0; k<overloads.GetCount(); k++) for (unsigned int k=0; k<overloads.GetCount(); k++)
if (overloads[k]->MatchesExceptForAttributes(m)) if (overloads[k]->MatchesExceptForAttributes(m))
{ {
@@ -331,14 +351,13 @@ int IfaceCheckApp::CompareClasses(const wxClass* iface, const wxClass* api)
if (FixMethod(iface->GetHeader(), &m, &tmp)) if (FixMethod(iface->GetHeader(), &m, &tmp))
LogMessage("Adjusted attributes of '%s' method", m.GetAsString()); LogMessage("Adjusted attributes of '%s' method", m.GetAsString());
exit = true; proceed = false;
break; break;
} }
if (!exit)
{
#endif // HACK_TO_AUTO_CORRECT_ONLY_METHOD_ATTRIBUTES #endif // HACK_TO_AUTO_CORRECT_ONLY_METHOD_ATTRIBUTES
if (proceed)
{
if (overloads.GetCount()==0) if (overloads.GetCount()==0)
{ {
LogMessage("%s: real '%s' class and their parents have no method '%s'", LogMessage("%s: real '%s' class and their parents have no method '%s'",
@@ -389,10 +408,7 @@ int IfaceCheckApp::CompareClasses(const wxClass* iface, const wxClass* api)
} }
count++; count++;
} // if (proceed)
#if HACK_TO_AUTO_CORRECT_ONLY_METHOD_ATTRIBUTES
}
#endif
} }
} }

1
utils/ifacecheck/src/xmlparser.cpp
View File

@@ -173,6 +173,7 @@ void wxArgumentType::SetDefaultValue(const wxString& defval, const wxString& def
p->Replace("0x000000001", "1"); p->Replace("0x000000001", "1");
p->Replace("\\000\\000\\000", ""); // fix for unicode strings: p->Replace("\\000\\000\\000", ""); // fix for unicode strings:
p->Replace("\\011", "\\t");
// ADHOC-FIX: for wxConv* default values // ADHOC-FIX: for wxConv* default values
p->Replace("wxConvAuto(wxFONTENCODING_DEFAULT)", "wxConvAuto()"); p->Replace("wxConvAuto(wxFONTENCODING_DEFAULT)", "wxConvAuto()");