update wxpresets for new osx_carbon and osx_cocoa names provided by the wx-config...

[wxWidgets.git] / utils / ifacecheck / src / xmlparser.cpp

diff --git a/utils/ifacecheck/src/xmlparser.cpp b/utils/ifacecheck/src/xmlparser.cpp
index 825d3fdddf6a0e0a03a971ab817d8daafce9d40c..8f46e23c21800789ab526fca1244aa40b781599d 100644 (file)
--- a/utils/ifacecheck/src/xmlparser.cpp
+++ b/utils/ifacecheck/src/xmlparser.cpp
@@ -165,13 +165,13 @@ void wxArgumentType::SetDefaultValue(const wxString& defval, const wxString& def
     // Note: we adjust the aesthetic form of the m_strDefaultValue string for the "modify mode"
     //       of ifacecheck: we may need to write it out in an interface header
 
     // Note: we adjust the aesthetic form of the m_strDefaultValue string for the "modify mode"
     //       of ifacecheck: we may need to write it out in an interface header
 

-    wxString *p;
+    wxString *p = NULL;

     for (int i=0; i<2; i++)     // to avoid copying&pasting the code!
     {
         if (i == 0) p = &m_strDefaultValue;
         if (i == 1) p = &m_strDefaultValueForCmp;
 
     for (int i=0; i<2; i++)     // to avoid copying&pasting the code!
     {
         if (i == 0) p = &m_strDefaultValue;
         if (i == 1) p = &m_strDefaultValueForCmp;
 

-        if (*p == "0u") *p = "0";
+        if (*p == "0u" || *p == "0l") *p = "0";

 
         p->Replace("0x000000001", "1");
         p->Replace("\\000\\000\\000", "");    // fix for unicode strings:
 
         p->Replace("0x000000001", "1");
         p->Replace("\\000\\000\\000", "");    // fix for unicode strings:


@@ -234,8 +234,10 @@ bool wxArgumentType::operator==(const wxArgumentType& m) const
             (m.m_strDefaultValueForCmp.IsNumber() && m_strDefaultValueForCmp.StartsWith("wx")))
         {
             if (g_verbose)
             (m.m_strDefaultValueForCmp.IsNumber() && m_strDefaultValueForCmp.StartsWith("wx")))
         {
             if (g_verbose)

+            {

                 wxLogMessage("Supposing '%s'  default value to be the same of '%s'...",
                            m_strDefaultValueForCmp, m.m_strDefaultValueForCmp);
                 wxLogMessage("Supposing '%s'  default value to be the same of '%s'...",
                            m_strDefaultValueForCmp, m.m_strDefaultValueForCmp);

+            }

 
             return true;
         }
 
             return true;
         }


@@ -260,8 +262,10 @@ bool wxArgumentType::operator==(const wxArgumentType& m) const
         }
 
         if (g_verbose)
         }
 
         if (g_verbose)

+        {

             wxLogMessage("Argument type '%s = %s' has different default value from '%s = %s'",
                        m_strType, m_strDefaultValueForCmp, m.m_strType, m.m_strDefaultValueForCmp);
             wxLogMessage("Argument type '%s = %s' has different default value from '%s = %s'",
                        m_strType, m_strDefaultValueForCmp, m.m_strType, m.m_strDefaultValueForCmp);

+        }

         return false;
     }
 
         return false;
     }
 


@@ -330,14 +334,18 @@ bool wxMethod::MatchesExceptForAttributes(const wxMethod& m) const
         GetName() != m.GetName())
     {
         if (g_verbose)
         GetName() != m.GetName())
     {
         if (g_verbose)

+        {

             wxLogMessage("The method '%s' does not match method '%s'; different names/rettype", GetName(), m.GetName());
             wxLogMessage("The method '%s' does not match method '%s'; different names/rettype", GetName(), m.GetName());

+        }

         return false;
     }
 
     if (m_args.GetCount()!=m.m_args.GetCount()) {
         if (g_verbose)
         return false;
     }
 
     if (m_args.GetCount()!=m.m_args.GetCount()) {
         if (g_verbose)

+        {

             wxLogMessage("Method '%s' has %d arguments while '%s' has %d arguments",
                        m_strName, m_args.GetCount(), m_strName, m.m_args.GetCount());
             wxLogMessage("Method '%s' has %d arguments while '%s' has %d arguments",
                        m_strName, m_args.GetCount(), m_strName, m.m_args.GetCount());

+        }

         return false;
     }
 
         return false;
     }
 


@@ -372,7 +380,9 @@ bool wxMethod::operator==(const wxMethod& m) const
         GetAccessSpecifier() != m.GetAccessSpecifier())
     {
         if (g_verbose)
         GetAccessSpecifier() != m.GetAccessSpecifier())
     {
         if (g_verbose)

+        {

             wxLogMessage("The method '%s' does not match method '%s'; different attributes", GetName(), m.GetName());
             wxLogMessage("The method '%s' does not match method '%s'; different attributes", GetName(), m.GetName());

+        }

 
         return false;
     }
 
         return false;
     }


@@ -1009,8 +1019,10 @@ bool wxXmlGccInterface::Parse(const wxString& filename)
                 // they're never used as return/argument types by wxWidgets methods
 
                 if (g_verbose)
                 // they're never used as return/argument types by wxWidgets methods
 
                 if (g_verbose)

+                {

                     wxLogWarning("Type node '%s' with ID '%s' does not have name attribute",
                                n, child->GetAttribute("id"));
                     wxLogWarning("Type node '%s' with ID '%s' does not have name attribute",
                                n, child->GetAttribute("id"));

+                }

 
                 types[id] = "TOFIX";
             }
 
                 types[id] = "TOFIX";
             }


@@ -1028,8 +1040,10 @@ bool wxXmlGccInterface::Parse(const wxString& filename)
     while (toResolveTypes.size()>0)
     {
         if (g_verbose)
     while (toResolveTypes.size()>0)
     {
         if (g_verbose)

+        {

             wxLogMessage("%d types were collected; %d types need yet to be resolved...",
                        types.size(), toResolveTypes.size());
             wxLogMessage("%d types were collected; %d types need yet to be resolved...",
                        types.size(), toResolveTypes.size());

+        }

 
         for (wxToResolveTypeHashMap::iterator i = toResolveTypes.begin();
              i != toResolveTypes.end();)
 
         for (wxToResolveTypeHashMap::iterator i = toResolveTypes.begin();
              i != toResolveTypes.end();)


@@ -1468,7 +1482,9 @@ bool wxXmlDoxygenInterface::ParseCompoundDefinition(const wxString& filename)
     int nodes = 0;
 
     if (g_verbose)
     int nodes = 0;
 
     if (g_verbose)

+    {

         wxLogMessage("Parsing %s...", filename);
         wxLogMessage("Parsing %s...", filename);

+    }

 
     if (!doc.Load(filename)) {
         wxLogError("can't load %s", filename);
 
     if (!doc.Load(filename)) {
         wxLogError("can't load %s", filename);


@@ -1495,18 +1511,23 @@ bool wxXmlDoxygenInterface::ParseCompoundDefinition(const wxString& filename)
             wxXmlNode *subchild = child->GetChildren();
             while (subchild)
             {
             wxXmlNode *subchild = child->GetChildren();
             while (subchild)
             {

-                wxString kind = subchild->GetAttribute("kind");
-
-                // parse only public&protected functions:
-                if (subchild->GetName() == "sectiondef" &&
-                    (kind == "public-func" || kind == "protected-func"))
+                // NOTE: when documenting functions using the //@{ and //@}
+                //       tags to create function groups, doxygen puts the
+                //       contained methods into a "user-defined" section
+                //       so we _must_ use the "prot" attribute to distinguish
+                //       public/protected methods from private ones and cannot
+                //       rely on the kind="public" attribute of <sectiondef>
+                if (subchild->GetName() == "sectiondef")

                 {
                 {

-

                     wxXmlNode *membernode = subchild->GetChildren();
                     while (membernode)
                     {
                     wxXmlNode *membernode = subchild->GetChildren();
                     while (membernode)
                     {

+                        const wxString& accessSpec = membernode->GetAttribute("prot");
+
+                        // parse only public&protected functions:

                         if (membernode->GetName() == "memberdef" &&
                         if (membernode->GetName() == "memberdef" &&

-                            membernode->GetAttribute("kind") == "function")
+                            membernode->GetAttribute("kind") == "function" &&
+                            (accessSpec == "public" || accessSpec == "protected"))

                         {
 
                             wxMethod m;
                         {
 
                             wxMethod m;


@@ -1516,11 +1537,11 @@ bool wxXmlDoxygenInterface::ParseCompoundDefinition(const wxString& filename)
                                 return false;
                             }
 
                                 return false;
                             }
 

-                            if (kind == "public-func")
+                            if (accessSpec == "public")

                                 m.SetAccessSpecifier(wxMAS_PUBLIC);
                                 m.SetAccessSpecifier(wxMAS_PUBLIC);

-                            else if (kind == "protected-func")
+                            else if (accessSpec == "protected")

                                 m.SetAccessSpecifier(wxMAS_PROTECTED);
                                 m.SetAccessSpecifier(wxMAS_PROTECTED);

-                            else if (kind == "private-func")
+                            else if (accessSpec == "private")

                                 m.SetAccessSpecifier(wxMAS_PRIVATE);
 
                             if (absoluteFile.IsEmpty())
                                 m.SetAccessSpecifier(wxMAS_PRIVATE);
 
                             if (absoluteFile.IsEmpty())


@@ -1571,10 +1592,14 @@ bool wxXmlDoxygenInterface::ParseCompoundDefinition(const wxString& filename)
 
             // add a new class
             if (klass.IsOk())
 
             // add a new class
             if (klass.IsOk())

+            {

                 m_classes.Add(klass);
                 m_classes.Add(klass);

+            }

             else if (g_verbose)
             else if (g_verbose)

+            {

                 wxLogWarning("discarding class '%s' with %d methods...",
                            klass.GetName(), klass.GetMethodCount());
                 wxLogWarning("discarding class '%s' with %d methods...",
                            klass.GetName(), klass.GetMethodCount());

+            }

         }
 
         child = child->GetNext();
         }
 
         child = child->GetNext();