#include <wx/arrimpl.cpp>
WX_DEFINE_OBJARRAY(wxTypeArray)
+WX_DEFINE_OBJARRAY(wxArgumentTypeArray)
WX_DEFINE_OBJARRAY(wxMethodArray)
WX_DEFINE_OBJARRAY(wxClassArray)
wxType wxEmptyType;
-void wxType::SetFromString(const wxString& t)
+void wxType::SetTypeFromString(const wxString& t)
{
- m_strType = t.Strip(wxString::both);
+ /*
+ TODO: optimize the following code writing a single function
+ which works at char-level and does everything in a single pass
+ */
+
+ m_strType = t;
// [] is the same as * for gccxml
m_strType.Replace("[]", "*");
+ m_strType.Replace("long int", "long"); // in wx typically we never write "long int", just "long"
+
+ // make sure the * and & operator always use the same spacing rules
+ // (to make sure GetAsString() output is always consistent)
+ m_strType.Replace("*", "* ");
+ m_strType.Replace("&", "& ");
+ m_strType.Replace(" *", "*");
+ m_strType.Replace(" &", "&");
+
+ while (m_strType.Contains(" "))
+ m_strType.Replace(" ", " "); // do it once again
+
+ m_strType.Replace(" ,", ",");
+
+ m_strType = m_strType.Strip(wxString::both);
}
bool wxType::IsOk() const
return false;
}
+
+// ----------------------------------------------------------------------------
+// wxArgumentType
+// ----------------------------------------------------------------------------
+
+void wxArgumentType::SetDefaultValue(const wxString& defval)
+{
+ m_strDefaultValue=defval;
+
+ // 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:
+ m_strDefaultValue.Replace("0u", "0");
+
+ if (IsPointer())
+ m_strDefaultValue.Replace("0", "NULL");
+ else
+ m_strDefaultValue.Replace("NULL", "0");
+
+
+ if (m_strDefaultValue.Contains("wxGetTranslation"))
+ m_strDefaultValue = wxEmptyString; // TODO: wxGetTranslation gives problems to gccxml
+}
+
+bool wxArgumentType::operator==(const wxArgumentType& m) const
+{
+ if ((const wxType&)(*this) != (const wxType&)m)
+ return false;
+
+ if (m_strDefaultValue != m.m_strDefaultValue)
+ return false;
+
+ // we deliberately avoid checks on the argument name
+
+ return true;
+}
+
+
// ----------------------------------------------------------------------------
// wxMethod
// ----------------------------------------------------------------------------
return false;
// a function can't be both const and static or virtual and static!
- if ((m_bConst && m_bStatic) || (m_bVirtual && m_bStatic)) {
+ if ((m_bConst && m_bStatic) || ((m_bVirtual || m_bPureVirtual) && m_bStatic)) {
LogError("'%s' method can't be both const/static or virtual/static", m_strName);
return false;
}
+ wxASSERT((m_bVirtual && m_bPureVirtual) || !m_bVirtual);
+
for (unsigned int i=0; i<m_args.GetCount(); i++)
if (!m_args[i].IsOk()) {
LogError("'%s' method has invalid %d-th argument type: %s",
return true;
}
-void wxMethod::SetArgumentTypes(const wxTypeArray& arr, const wxArrayString& defaults)
-{
- wxASSERT(arr.GetCount()==defaults.GetCount());
-
- m_args=arr;
- m_argDefaults=defaults;
-
- // 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
- for (unsigned int i=0; i<m_argDefaults.GetCount(); i++)
- {
- m_argDefaults[i].Replace("NULL", "0");
- m_argDefaults[i].Replace("0u", "0");
- }
-}
-
bool wxMethod::operator==(const wxMethod& m) const
{
if (GetReturnType() != m.GetReturnType() ||
IsConst() != m.IsConst() ||
IsStatic() != m.IsStatic() ||
IsVirtual() != m.IsVirtual() ||
+ IsPureVirtual() != m.IsPureVirtual() ||
IsDeprecated() != m.IsDeprecated())
return false;
return false;
for (unsigned int i=0; i<m_args.GetCount(); i++)
- if (m_args[i] != m.m_args[i] || m_argDefaults[i] != m.m_argDefaults[i])
+ if (m_args[i] != m.m_args[i])
return false;
return true;
}
-wxString wxMethod::GetAsString() const
+wxString wxMethod::GetAsString(bool bWithArgumentNames) const
{
wxString ret;
for (unsigned int i=0; i<m_args.GetCount(); i++)
{
ret += m_args[i].GetAsString();
- if (!m_argDefaults[i].IsEmpty())
- ret += " = " + m_argDefaults[i];
+
+ const wxString& name = m_args[i].GetArgumentName();
+ if (bWithArgumentNames && !name.IsEmpty())
+ ret += " " + name;
+
+ const wxString& def = m_args[i].GetDefaultValue();
+ if (!def.IsEmpty())
+ ret += " = " + def;
+
ret += ", ";
}
ret += " const";
if (m_bStatic)
ret = "static " + ret;
- if (m_bVirtual)
+ if (m_bVirtual || m_bPureVirtual)
ret = "virtual " + ret;
+ if (m_bPureVirtual)
+ ret = ret + " = 0";
// in doxygen headers we don't need wxDEPRECATED:
//if (m_bDeprecated)
stream << "[" + m_strName + "]";
for (unsigned int i=0; i<m_args.GetCount(); i++)
- stream << "[" + m_args[i].GetAsString() + "=" + m_argDefaults[i] + "]";
+ stream << "[" + m_args[i].GetAsString() + " " + m_args[i].GetArgumentName() +
+ "=" + m_args[i].GetDefaultValue() + "]";
if (IsConst())
stream << " CONST";
stream << " STATIC";
if (IsVirtual())
stream << " VIRTUAL";
+ if (IsPureVirtual())
+ stream << " PURE-VIRTUAL";
if (IsDeprecated())
stream << " DEPRECATED";
}
// resolve argument types
- wxTypeArray argtypes;
- wxArrayString argdefs;
+ wxArgumentTypeArray argtypes;
wxXmlNode *arg = p->GetChildren();
while (arg)
{
return false;
}
- argtypes.Add(wxType(idx->second));
-
- wxString def = arg->GetAttribute("default");
- if (def.Contains("wxGetTranslation"))
- argdefs.Add(wxEmptyString); // TODO: wxGetTranslation gives problems to gccxml
- else
- argdefs.Add(def);
+ argtypes.Add(wxArgumentType(idx->second, arg->GetAttribute("default")));
}
arg = arg->GetNext();
m.SetReturnType(ret);
m.SetName(name);
- m.SetArgumentTypes(argtypes, argdefs);
+ m.SetArgumentTypes(argtypes);
m.SetConst(p->GetAttribute("const") == "1");
m.SetStatic(p->GetAttribute("static") == "1");
m.SetVirtual(p->GetAttribute("virtual") == "1");
+ m.SetPureVirtual(p->GetAttribute("pure_virtual") == "1");
m.SetDeprecated(p->GetAttribute("attributes") == "deprecated");
if (!m.IsOk()) {
bool wxXmlDoxygenInterface::ParseMethod(const wxXmlNode* p, wxMethod& m, wxString& header)
{
- wxTypeArray args;
- wxArrayString defs;
+ wxArgumentTypeArray args;
long line;
wxXmlNode *child = p->GetChildren();
m.SetReturnType(wxType(GetTextFromChildren(child)));
else if (child->GetName() == "param")
{
- wxString typestr, defstr, arrstr;
+ wxString typestr, namestr, defstr, arrstr;
wxXmlNode *n = child->GetChildren();
while (n)
{
// if the <type> node has children, they should be all TEXT and <ref> nodes
// and we need to take the text they contain, in the order they appear
typestr = GetTextFromChildren(n);
+ else if (n->GetName() == "declname")
+ namestr = GetTextFromChildren(n);
else if (n->GetName() == "defval")
- // same for the <defval> node
defstr = GetTextFromChildren(n);
else if (n->GetName() == "array")
arrstr = GetTextFromChildren(n);
return false;
}
- args.Add(wxType(typestr + arrstr));
- defs.Add(defstr);
+ args.Add(wxArgumentType(typestr + arrstr, defstr, namestr));
}
else if (child->GetName() == "location")
{
child = child->GetNext();
}
- m.SetArgumentTypes(args, defs);
+ m.SetArgumentTypes(args);
m.SetConst(p->GetAttribute("const")=="yes");
m.SetStatic(p->GetAttribute("static")=="yes");
m.SetVirtual(p->GetAttribute("virt")=="virtual");
+ m.SetPureVirtual(p->GetAttribute("virt")=="pure-virtual");
if (!m.IsOk()) {
LogError("The prototype '%s' is not valid!", m.GetAsString());
projects / wxWidgets.git / blobdiff