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

added wxMethodAccessSpecifier and the logic to extract both public and protected methods from gccXML and doxygenXML

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-09-27 18:57:51 +00:00
parent 99f7ee578d
commit 8cd2247801
3 changed files with 86 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,6 +145,18 @@ void wxArgumentType::SetDefaultValue(const wxString& defval, const wxString& def
// to a single form:
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_strDefaultValueForCmp.Replace("0", "NULL");
@@ -280,14 +292,16 @@ 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;
@@ -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)