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

Refactor node type checks for attribute insertion

Browse Source 
Add allow_insert_attribute (similar to allow_insert_child).
This commit is contained in:
Arseny Kapoulkine 2014-11-20 20:29:21 -08:00
parent 8f85b1ba7a
commit a0dc468170
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pugixml.cpp
View File

@ -3682,6 +3682,11 @@ PUGI__NS_BEGIN
return false; return false;
} }
PUGI__FN bool allow_insert_attribute(xml_node_type parent)
{
return parent == node_element || parent == node_declaration;
}
PUGI__FN bool allow_insert_child(xml_node_type parent, xml_node_type child) PUGI__FN bool allow_insert_child(xml_node_type parent, xml_node_type child)
{ {
if (parent != node_document && parent != node_element) return false; if (parent != node_document && parent != node_element) return false;
@ -4872,7 +4877,7 @@ namespace pugi
PUGI__FN xml_attribute xml_node::append_attribute(const char_t* name_) PUGI__FN xml_attribute xml_node::append_attribute(const char_t* name_)
{ {
if (type() != node_element && type() != node_declaration) return xml_attribute(); if (!impl::allow_insert_attribute(type())) return xml_attribute();
xml_attribute a(impl::allocate_attribute(impl::get_allocator(_root))); xml_attribute a(impl::allocate_attribute(impl::get_allocator(_root)));
if (!a) return xml_attribute(); if (!a) return xml_attribute();
@ -4886,7 +4891,7 @@ namespace pugi
PUGI__FN xml_attribute xml_node::prepend_attribute(const char_t* name_) PUGI__FN xml_attribute xml_node::prepend_attribute(const char_t* name_)
{ {
if (type() != node_element && type() != node_declaration) return xml_attribute(); if (!impl::allow_insert_attribute(type())) return xml_attribute();
xml_attribute a(impl::allocate_attribute(impl::get_allocator(_root))); xml_attribute a(impl::allocate_attribute(impl::get_allocator(_root)));
if (!a) return xml_attribute(); if (!a) return xml_attribute();
@ -4900,7 +4905,7 @@ namespace pugi
PUGI__FN xml_attribute xml_node::insert_attribute_after(const char_t* name_, const xml_attribute& attr) PUGI__FN xml_attribute xml_node::insert_attribute_after(const char_t* name_, const xml_attribute& attr)
{ {
if (type() != node_element && type() != node_declaration) return xml_attribute(); if (!impl::allow_insert_attribute(type())) return xml_attribute();
if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute(); if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
xml_attribute a(impl::allocate_attribute(impl::get_allocator(_root))); xml_attribute a(impl::allocate_attribute(impl::get_allocator(_root)));
@ -4915,7 +4920,7 @@ namespace pugi
PUGI__FN xml_attribute xml_node::insert_attribute_before(const char_t* name_, const xml_attribute& attr) PUGI__FN xml_attribute xml_node::insert_attribute_before(const char_t* name_, const xml_attribute& attr)
{ {
if (type() != node_element && type() != node_declaration) return xml_attribute(); if (!impl::allow_insert_attribute(type())) return xml_attribute();
if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute(); if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
xml_attribute a(impl::allocate_attribute(impl::get_allocator(_root))); xml_attribute a(impl::allocate_attribute(impl::get_allocator(_root)));