Changeset 56224

Timestamp:

10/10/08 15:51:26 (6 weeks ago)

Author:

FM

Message:

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

Location:

wxWidgets/trunk/utils/ifacecheck/src

Files:

• ifacecheck.cpp (modified) (2 diffs)
• xmlparser.cpp (modified) (6 diffs)

wxWidgets/trunk/utils/ifacecheck/src/ifacecheck.cpp

@@ -302 +302 @@
         real = api->RecursiveUpwardFindMethod(m, &m_gccInterface);
 
-        if (real)
+        if (!real)
         {
             bool exit = false;
@@ -344 +344 @@
                                                 "'%s' all with different signatures:\n",
                                                 overloads.GetCount(), m.GetName(), api->GetName());
-                else
+                else {
                     warning += wxString::Format(": in the real headers there is a method '%s' for '%s'"
                                                 " but has different signature:\n",
                                                 m.GetName(), api->GetName());
+                }
 
                 // get a list of the prototypes with _all_ possible attributes:

wxWidgets/trunk/utils/ifacecheck/src/xmlparser.cpp

@@ -1 @@
-/////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////
 // Name:        xmlparser.cpp
 // Purpose:     Parser of the API/interface XML files
@@ -122 +122 @@
 
     if (g_verbose)
+    {
         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;
@@ -294 +300 @@
     if (GetReturnType() != m.GetReturnType() ||
         GetName() != m.GetName())
-        return false;
+    {
+        if (g_verbose)
+            LogMessage("The method '%s' does not match method '%s'; different names/rettype", GetName(), m.GetName());
+        return false;
+    }
 
     if (m_args.GetCount()!=m.m_args.GetCount()) {
@@ -320 +330 @@
         IsDeprecated() != m.IsDeprecated() ||
         GetAccessSpecifier() != m.GetAccessSpecifier())
-        return false;
+    {
+        if (g_verbose)
+            LogMessage("The method '%s' does not match method '%s'; different attributes", GetName(), m.GetName());
+
+        return false;
+    }
 
     // check everything else
@@ -470 +485 @@
                          m_strName, m_methods[i].GetAsString());
                 return false;
-                ((wxClass*)this)->m_methods.RemoveAt(j);
-                j--;
+
+                // fix the problem?
+                //((wxClass*)this)->m_methods.RemoveAt(j);
+                //j--;
             }
 
@@ -662 +679 @@
 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;
 #if wxUSE_UNICODE_WCHAR