X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97f0dbd6f81fae70cbef690c0c0af10cf4334659..b91c4601f2cc8fab375dc49a0a1222d58065cfdb:/utils/ifacecheck/src/xmlparser.cpp diff --git a/utils/ifacecheck/src/xmlparser.cpp b/utils/ifacecheck/src/xmlparser.cpp index b4a0c33f26..54522205f1 100644 --- a/utils/ifacecheck/src/xmlparser.cpp +++ b/utils/ifacecheck/src/xmlparser.cpp @@ -132,19 +132,36 @@ bool wxType::operator==(const wxType& m) const void wxArgumentType::SetDefaultValue(const wxString& defval, const wxString& defvalForCmp) { - m_strDefaultValue=defval.Strip(wxString::both); - m_strDefaultValueForCmp=defvalForCmp.Strip(wxString::both); + m_strDefaultValue = defval.Strip(wxString::both); + m_strDefaultValueForCmp = defvalForCmp.IsEmpty() ? m_strDefaultValue : defvalForCmp.Strip(wxString::both); + + // adjust aesthetic form of DefaultValue for the modify mode of ifacecheck: + // we may need to write it out in an interface header + if (m_strDefaultValue == "0u") + m_strDefaultValue = "0"; // in order to make valid&simple comparison on argument defaults, // we reduce some of the multiple forms in which the same things may appear // to a single form: - if (m_strDefaultValue == "0u") - m_strDefaultValue = "0"; + if (m_strDefaultValueForCmp == "0u") + m_strDefaultValueForCmp = "0"; + + // fix for unicode strings: + m_strDefaultValueForCmp.Replace("\\000\\000\\000", ""); + + if (m_strDefaultValueForCmp.StartsWith("wxT(") && + m_strDefaultValueForCmp.EndsWith(")")) + { + // get rid of the wxT() part + unsigned int len = m_strDefaultValueForCmp.Len(); + m_strDefaultValueForCmp = m_strDefaultValueForCmp.Mid(4,len-5); + } + /* if (IsPointer()) - m_strDefaultValue.Replace("0", "NULL"); + m_strDefaultValueForCmp.Replace("0", "NULL"); else - m_strDefaultValue.Replace("NULL", "0"); + m_strDefaultValueForCmp.Replace("NULL", "0"); */ // ADHOC-FIX: // doxygen likes to put wxDateTime:: in front of all wxDateTime enums; @@ -153,8 +170,8 @@ void wxArgumentType::SetDefaultValue(const wxString& defval, const wxString& def m_strDefaultValueForCmp.Replace("wxStockGDI::", ""); // same story for some other classes // ADHOC-FIX: - if (m_strDefaultValue.Contains("wxGetTranslation")) - m_strDefaultValue = "_(TOFIX)"; // TODO: wxGetTranslation gives problems to gccxml + if (m_strDefaultValueForCmp.Contains("wxGetTranslation")) + m_strDefaultValueForCmp = "_(TOFIX)"; // TODO: wxGetTranslation gives problems to gccxml } bool wxArgumentType::operator==(const wxArgumentType& m) const @@ -162,24 +179,21 @@ bool wxArgumentType::operator==(const wxArgumentType& m) const if ((const wxType&)(*this) != (const wxType&)m) return false; - const wxString& def1 = m_strDefaultValueForCmp.IsEmpty() ? m_strDefaultValue : m_strDefaultValueForCmp; - const wxString& def2 = m.m_strDefaultValueForCmp.IsEmpty() ? m.m_strDefaultValue : m.m_strDefaultValueForCmp; - // ADHOC-FIX: // default values for style attributes of wxWindow-derived classes in gccxml appear as raw // numbers; avoid false positives in this case! if (m_strArgName == m.m_strArgName && m_strArgName == "style" && - (def1.IsNumber() || def2.IsNumber())) + (m_strDefaultValueForCmp.IsNumber() || m.m_strDefaultValueForCmp.IsNumber())) return true; - if (def1 != def2) + if (m_strDefaultValueForCmp != m.m_strDefaultValueForCmp) { // maybe the default values are numbers. // in this case gccXML gives as default values things like '-0x0000001' instead of just '-1'. // To handle these cases, we try to convert the default value strings to numbers: long def1val, def2val; - if (def1.ToLong(&def1val, 0 /* auto-detect */) && - def2.ToLong(&def2val, 0 /* auto-detect */)) + if (m_strDefaultValueForCmp.ToLong(&def1val, 0 /* auto-detect */) && + m.m_strDefaultValueForCmp.ToLong(&def2val, 0 /* auto-detect */)) { if (def1val == def2val) return true; // the default values match @@ -187,7 +201,7 @@ bool wxArgumentType::operator==(const wxArgumentType& m) const if (g_verbose) LogMessage("Argument type '%s = %s' has different default value from '%s = %s'", - m_strType, def1, m.m_strType, def2); + m_strType, m_strDefaultValueForCmp, m.m_strType, m.m_strDefaultValueForCmp); return false; } @@ -278,24 +292,24 @@ bool wxMethod::operator==(const wxMethod& m) const IsStatic() != m.IsStatic() || IsVirtual() != m.IsVirtual() || IsPureVirtual() != m.IsPureVirtual() || - IsDeprecated() != m.IsDeprecated()) + IsDeprecated() != m.IsDeprecated() || + GetAccessSpecifier() != m.GetAccessSpecifier()) return false; // check everything else return MatchesExceptForAttributes(m); } -wxString wxMethod::GetAsString(bool bWithArgumentNames, bool bClean, bool bDeprecated) const +wxString wxMethod::GetAsString(bool bWithArgumentNames, bool bCleanDefaultValues, + bool bDeprecated, bool bAccessSpec) const { wxString ret; + // NOTE: for return and argument types, never use wxType::GetAsCleanString + // since in that way we'd miss important decorators like &,*,const etc + if (m_retType!=wxEmptyType) - { - if (bClean) - ret += m_retType.GetAsCleanString() + " "; - else - ret += m_retType.GetAsString() + " "; - } + ret += m_retType.GetAsString() + " "; //else; this is a ctor or dtor ret += m_strName + "("; @@ -308,7 +322,7 @@ wxString wxMethod::GetAsString(bool bWithArgumentNames, bool bClean, bool bDepre if (bWithArgumentNames && !name.IsEmpty()) ret += " " + name; - const wxString& def = bClean ? + const wxString& def = bCleanDefaultValues ? m_args[i].GetDefaultCleanValue() : m_args[i].GetDefaultValue(); if (!def.IsEmpty()) ret += " = " + def; @@ -332,6 +346,22 @@ wxString wxMethod::GetAsString(bool bWithArgumentNames, bool bClean, bool bDepre if (m_bDeprecated && bDeprecated) ret += " [deprecated]"; + if (bAccessSpec) + { + switch (m_access) + { + case wxMAS_PUBLIC: + ret += " [public]"; + break; + case wxMAS_PROTECTED: + ret += " [protected]"; + break; + case wxMAS_PRIVATE: + ret += " [private]"; + break; + } + } + return ret; } @@ -903,10 +933,10 @@ bool wxXmlGccInterface::Parse(const wxString& filename) child = doc.GetRoot()->GetChildren(); while (child) { - wxString n = child->GetName(); + wxString n = child->GetName(), acc = child->GetAttribute("access"); - // only register public methods - if (child->GetAttribute("access") == "public" && + // only register public&protected methods + if ((acc == "public" || acc == "protected") && (n == "Method" || n == "Constructor" || n == "Destructor" || n == "OperatorMethod")) { unsigned long id = 0; @@ -928,6 +958,8 @@ bool wxXmlGccInterface::Parse(const wxString& filename) return false; } + // do some additional check that we can do only here: + if (newfunc.IsCtor() && !p->IsValidCtorForThisClass(newfunc)) { LogError("The method '%s' does not seem to be a ctor for '%s'", newfunc.GetName(), p->GetName()); @@ -1036,6 +1068,14 @@ bool wxXmlGccInterface::ParseMethod(const wxXmlNode *p, m.SetPureVirtual(p->GetAttribute("pure_virtual") == "1"); m.SetDeprecated(p->GetAttribute("attributes") == "deprecated"); + // decode access specifier + if (p->GetAttribute("access") == "public") + m.SetAccessSpecifier(wxMAS_PUBLIC); + else if (p->GetAttribute("access") == "protected") + m.SetAccessSpecifier(wxMAS_PROTECTED); + else if (p->GetAttribute("access") == "private") + m.SetAccessSpecifier(wxMAS_PRIVATE); + if (!m.IsOk()) { LogError("The prototype '%s' is not valid!", m.GetAsString()); return false; @@ -1249,8 +1289,11 @@ bool wxXmlDoxygenInterface::ParseCompoundDefinition(const wxString& filename) wxXmlNode *subchild = child->GetChildren(); while (subchild) { + wxString kind = subchild->GetAttribute("kind"); + + // parse only public&protected functions: if (subchild->GetName() == "sectiondef" && - subchild->GetAttribute("kind") == "public-func") + (kind == "public-func" || kind == "protected-func")) { wxXmlNode *membernode = subchild->GetChildren(); @@ -1267,6 +1310,13 @@ bool wxXmlDoxygenInterface::ParseCompoundDefinition(const wxString& filename) return false; } + if (kind == "public-func") + m.SetAccessSpecifier(wxMAS_PUBLIC); + else if (kind == "protected-func") + m.SetAccessSpecifier(wxMAS_PROTECTED); + else if (kind == "private-func") + m.SetAccessSpecifier(wxMAS_PRIVATE); + if (absoluteFile.IsEmpty()) absoluteFile = header; else if (header != absoluteFile)