External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ci

Browse Source
This commit is contained in:
halx99 2021-12-23 19:14:53 +08:00
parent 46805e8c08
commit f0259eb00a
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/pugixml.cpp
View File

@ -1099,16 +1099,20 @@ namespace pugi
header = PUGI__GETHEADER_IMPL(this, page, 0); header = PUGI__GETHEADER_IMPL(this, page, 0);
} }
inline string_view_t name_sv() const { inline string_view_t unsafe_name_sv() const {
return string_view_t(name, name_len); return string_view_t(name, name_len);
} }
inline string_view_t value_sv() const { inline string_view_t unsafe_value_sv() const {
return string_view_t(value, value_len); return string_view_t(value, value_len);
} }
inline string_view_t value_sv() const {
return value ? unsafe_value_sv() : PUGIXML_EMPTY_SV;
}
inline bool equals_name(string_view_t rhs) const { inline bool equals_name(string_view_t rhs) const {
return name && name_sv() == rhs; return name && unsafe_name_sv() == rhs;
} }
inline bool equals_value(string_view_t rhs) const { inline bool equals_value(string_view_t rhs) const {
@ -1134,16 +1138,20 @@ namespace pugi
header = PUGI__GETHEADER_IMPL(this, page, type); header = PUGI__GETHEADER_IMPL(this, page, type);
} }
inline string_view_t name_sv() const { inline string_view_t unsafe_name_sv() const {
return name ? string_view_t(name, name_len) : string_view_t(PUGIXML_TEXT(""), 0); return string_view_t(name, name_len);
}
inline string_view_t unsafe_value_sv() const {
return string_view_t(value, value_len);
} }
inline string_view_t value_sv() const { inline string_view_t value_sv() const {
return value ? string_view_t(value, value_len) : string_view_t(PUGIXML_TEXT(""), 0); return value ? unsafe_value_sv() : PUGIXML_EMPTY_SV;
} }
inline bool equals_name(string_view_t rhs) const { inline bool equals_name(string_view_t rhs) const {
return name && name_sv() == rhs; return name && unsafe_name_sv() == rhs;
} }
uintptr_t header; uintptr_t header;
@ -5259,7 +5267,7 @@ namespace pugi
PUGI__FN string_view_t xml_attribute::as_string(string_view_t def) const PUGI__FN string_view_t xml_attribute::as_string(string_view_t def) const
{ {
return (_attr && _attr->value) ? _attr->value_sv() : def; return (_attr && _attr->value) ? _attr->unsafe_value_sv() : def;
} }
PUGI__FN int xml_attribute::as_int(int def) const PUGI__FN int xml_attribute::as_int(int def) const
@ -5306,12 +5314,12 @@ namespace pugi
PUGI__FN string_view_t xml_attribute::name() const PUGI__FN string_view_t xml_attribute::name() const
{ {
return (_attr && _attr->name) ? _attr->name_sv() : string_view_t(PUGIXML_TEXT(""), 0); return (_attr && _attr->name) ? _attr->unsafe_name_sv() : PUGIXML_EMPTY_SV;
} }
PUGI__FN string_view_t xml_attribute::value() const PUGI__FN string_view_t xml_attribute::value() const
{ {
return (_attr && _attr->value) ? _attr->value_sv() : string_view_t(PUGIXML_TEXT(""), 0); return (_attr && _attr->value) ? _attr->unsafe_value_sv() : PUGIXML_EMPTY_SV;
} }
PUGI__FN size_t xml_attribute::hash_value() const PUGI__FN size_t xml_attribute::hash_value() const
@ -5585,7 +5593,7 @@ namespace pugi
PUGI__FN string_view_t xml_node::name() const PUGI__FN string_view_t xml_node::name() const
{ {
return (_root && _root->name) ? _root->name_sv() : string_view_t(PUGIXML_TEXT(""), 0); return (_root && _root->name) ? _root->unsafe_name_sv() : PUGIXML_EMPTY_SV;
} }
PUGI__FN xml_node_type xml_node::type() const PUGI__FN xml_node_type xml_node::type() const
@ -5595,7 +5603,7 @@ namespace pugi
PUGI__FN string_view_t xml_node::value() const PUGI__FN string_view_t xml_node::value() const
{ {
return (_root && _root->value) ? _root->value_sv() : string_view_t(PUGIXML_TEXT(""), 0); return (_root && _root->value) ? _root->unsafe_value_sv() : PUGIXML_EMPTY_SV;
} }
PUGI__FN xml_node xml_node::child(const string_view_t name_) const PUGI__FN xml_node xml_node::child(const string_view_t name_) const
@ -5702,7 +5710,7 @@ namespace pugi
PUGI__FN string_view_t xml_node::child_value() const PUGI__FN string_view_t xml_node::child_value() const
{ {
if (!_root) return string_view_t(PUGIXML_TEXT(""), 0); if (!_root) return PUGIXML_EMPTY_SV;
// element nodes can have value if parse_embed_pcdata was used // element nodes can have value if parse_embed_pcdata was used
if (PUGI__NODETYPE(_root) == node_element && _root->value) if (PUGI__NODETYPE(_root) == node_element && _root->value)
@ -5712,7 +5720,7 @@ namespace pugi
if (impl::is_text_node(i) && i->value) if (impl::is_text_node(i) && i->value)
return i->value_sv(); return i->value_sv();
return string_view_t(PUGIXML_TEXT(""), 0); return PUGIXML_EMPTY_SV;
} }
PUGI__FN string_view_t xml_node::child_value(string_view_t name_) const PUGI__FN string_view_t xml_node::child_value(string_view_t name_) const
@ -6542,14 +6550,14 @@ namespace pugi
{ {
xml_node_struct* d = _data(); xml_node_struct* d = _data();
return (d && d->value) ? d->value_sv() : string_view_t(PUGIXML_TEXT(""), 0); return (d && d->value) ? d->unsafe_value_sv() : PUGIXML_EMPTY_SV;
} }
PUGI__FN string_view_t xml_text::as_string(string_view_t def) const PUGI__FN string_view_t xml_text::as_string(string_view_t def) const
{ {
xml_node_struct* d = _data(); xml_node_struct* d = _data();
return (d && d->value) ? d->value_sv() : def; return (d && d->value) ? d->unsafe_value_sv() : def;
} }
PUGI__FN int xml_text::as_int(int def) const PUGI__FN int xml_text::as_int(int def) const

6
src/pugixml.hpp
View File

@ -273,6 +273,8 @@ namespace pugi
typedef pugi::basic_string_view<char_t, std::char_traits<char_t> > string_view_t; typedef pugi::basic_string_view<char_t, std::char_traits<char_t> > string_view_t;
} }
#define PUGIXML_EMPTY_SV pugi::string_view_t(PUGIXML_TEXT(""), 0)
// The PugiXML namespace // The PugiXML namespace
namespace pugi namespace pugi
{ {
@ -532,7 +534,7 @@ namespace pugi
string_view_t value() const; string_view_t value() const;
// Get attribute value, or the default value if attribute is empty // Get attribute value, or the default value if attribute is empty
string_view_t as_string(string_view_t def = string_view_t(PUGIXML_TEXT(""), 0)) const; string_view_t as_string(string_view_t def = PUGIXML_EMPTY_SV) const;
// Get attribute value as a number, or the default value if conversion did not succeed or attribute is empty // Get attribute value as a number, or the default value if conversion did not succeed or attribute is empty
int as_int(int def = 0) const; int as_int(int def = 0) const;
@ -892,7 +894,7 @@ namespace pugi
string_view_t get() const; string_view_t get() const;
// Get text, or the default value if object is empty // Get text, or the default value if object is empty
string_view_t as_string(string_view_t def = string_view_t(PUGIXML_TEXT(""), 0)) const; string_view_t as_string(string_view_t def = PUGIXML_EMPTY_SV) const;
// Get text as a number, or the default value if conversion did not succeed or object is empty // Get text as a number, or the default value if conversion did not succeed or object is empty
int as_int(int def = 0) const; int as_int(int def = 0) const;