maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Allow clients to get parsing errors and also fix the ApplePropertyList so it parses the structured data correctly. 

llvm-svn: 238280
This commit is contained in:
Greg Clayton 2015-05-27 03:24:17 +00:00
parent 66b8294cae
commit 2a2949cf47
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lldb/include/lldb/Host/XML.h
View File

@ -168,6 +168,9 @@ namespace lldb_private {
//----------------------------------------------------------------------
XMLNode
GetRootElement(const char *required_name = nullptr);
const std::string &
GetErrors() const;
static void
ErrorCallback (void *ctx, const char *format, ...);
@ -187,9 +190,14 @@ namespace lldb_private {
ApplePropertyList(const char *path);
~ApplePropertyList();
bool
ParseFile (const char *path);
const std::string &
GetErrors() const;
explicit operator bool() const
{
return IsValid();

23
lldb/source/Host/common/XML.cpp
View File

@ -105,6 +105,12 @@ XMLDocument::GetRootElement(const char *required_name)
return XMLNode();
}
const std::string &
XMLDocument::GetErrors() const
{
return m_errors.GetString();
}
bool
XMLDocument::XMLEnabled ()
{
@ -504,6 +510,17 @@ ApplePropertyList::ApplePropertyList (const char *path) :
ParseFile(path);
}
ApplePropertyList::~ApplePropertyList()
{
}
const std::string &
ApplePropertyList::GetErrors() const
{
return m_xml_doc.GetErrors();
}
bool
ApplePropertyList::ParseFile (const char *path)
{
@ -619,7 +636,9 @@ namespace {
// This is a value node
if (key_node)
{
dict_sp->AddItem(key_node.GetName(), CreatePlistValue(node));
std::string key_name;
key_node.GetElementText(key_name);
dict_sp->AddItem(key_name, CreatePlistValue(node));
key_node.Clear();
}
}
@ -639,7 +658,7 @@ namespace {
node.GetElementTextAsUnsigned(value, 0, 0);
return StructuredData::ObjectSP(new StructuredData::Integer(value));
}
else if ((element_name == "string") || (element_name == "data"))
else if ((element_name == "string") || (element_name == "data") || (element_name == "date"))
{
std::string text;
node.GetElementText(text);