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

fix two bugs: 1) the missing NOT in the if (real) test; 2) the missing +1 in getID() function; add many checks and log messages

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-10-10 22:51:26 +00:00
parent 7a0007346b
commit fce3374f35
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -301,7 +301,7 @@ 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);
if (real) if (!real)
{ {
bool exit = false; bool exit = false;
wxMethodPtrArray overloads = wxMethodPtrArray overloads =
@@ -343,10 +343,11 @@ int IfaceCheckApp::CompareClasses(const wxClass* iface, const wxClass* api)
warning += wxString::Format(": in the real headers there are %d overloads of '%s' for " warning += wxString::Format(": in the real headers there are %d overloads of '%s' for "
"'%s' all with different signatures:\n", "'%s' all with different signatures:\n",
overloads.GetCount(), m.GetName(), api->GetName()); overloads.GetCount(), m.GetName(), api->GetName());
else else {
warning += wxString::Format(": in the real headers there is a method '%s' for '%s'" warning += wxString::Format(": in the real headers there is a method '%s' for '%s'"
" but has different signature:\n", " but has different signature:\n",
m.GetName(), api->GetName()); m.GetName(), api->GetName());
}
// get a list of the prototypes with _all_ possible attributes: // get a list of the prototypes with _all_ possible attributes:
warning += "\tdoxy header: " + m.GetAsString(true, true, true, true); warning += "\tdoxy header: " + m.GetAsString(true, true, true, true);

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

@@ -121,7 +121,13 @@ bool wxType::operator==(const wxType& m) const
return true; return true;
if (g_verbose) if (g_verbose)
{
LogMessage("Type '%s' does not match type '%s'", m_strType, m.m_strType); LogMessage("Type '%s' does not match type '%s'", m_strType, m.m_strType);
LogMessage(" => TypeClean %s / %s; IsConst %d / %d; IsStatic %d / %d; IsPointer %d / %d; IsReference %d / %d",
m_strTypeClean, m.m_strTypeClean, IsConst(), m.IsConst(),
IsStatic(), m.IsStatic(), IsPointer(), m.IsPointer(),
IsReference(), m.IsReference());
}
return false; return false;
} }
@@ -293,7 +299,11 @@ bool wxMethod::MatchesExceptForAttributes(const wxMethod& m) const
{ {
if (GetReturnType() != m.GetReturnType() || if (GetReturnType() != m.GetReturnType() ||
GetName() != m.GetName()) GetName() != m.GetName())
{
if (g_verbose)
LogMessage("The method '%s' does not match method '%s'; different names/rettype", GetName(), m.GetName());
return false; return false;
}
if (m_args.GetCount()!=m.m_args.GetCount()) { if (m_args.GetCount()!=m.m_args.GetCount()) {
if (g_verbose) if (g_verbose)
@@ -319,7 +329,12 @@ bool wxMethod::operator==(const wxMethod& m) const
IsPureVirtual() != m.IsPureVirtual() || IsPureVirtual() != m.IsPureVirtual() ||
IsDeprecated() != m.IsDeprecated() || IsDeprecated() != m.IsDeprecated() ||
GetAccessSpecifier() != m.GetAccessSpecifier()) GetAccessSpecifier() != m.GetAccessSpecifier())
{
if (g_verbose)
LogMessage("The method '%s' does not match method '%s'; different attributes", GetName(), m.GetName());
return false; return false;
}
// check everything else // check everything else
return MatchesExceptForAttributes(m); return MatchesExceptForAttributes(m);
@@ -469,8 +484,10 @@ bool wxClass::CheckConsistency() const
LogError("class %s has two methods with the same prototype: '%s'", LogError("class %s has two methods with the same prototype: '%s'",
m_strName, m_methods[i].GetAsString()); m_strName, m_methods[i].GetAsString());
return false; return false;
((wxClass*)this)->m_methods.RemoveAt(j);
j--; // fix the problem?
//((wxClass*)this)->m_methods.RemoveAt(j);
//j--;
} }
return true; return true;
@@ -661,7 +678,7 @@ typedef std::map<unsigned long, toResolveTypeItem> wxToResolveTypeHashMap;
// but is a little bit faster // but is a little bit faster
bool getID(unsigned long *id, const wxString& str) bool getID(unsigned long *id, const wxString& str)
{ {
const wxStringCharType * const start = str.wx_str(); const wxStringCharType * const start = str.wx_str()+1;
wxStringCharType *end; wxStringCharType *end;
#if wxUSE_UNICODE_WCHAR #if wxUSE_UNICODE_WCHAR
unsigned long val = wcstoul(start, &end, GCCXML_BASE); unsigned long val = wcstoul(start, &end, GCCXML_BASE);