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

Minor xpath_variable refactoring

Browse Source 
The type of the variable is now initialized correctly in the ctor, so that there
is no interim invalid state.
This commit is contained in:
Arseny Kapoulkine 2015-04-15 08:32:22 -07:00
parent 5158ee903b
commit 8c8940430a
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pugixml.cpp
View File

@ -7626,7 +7626,7 @@ PUGI__NS_BEGIN
struct xpath_variable_boolean: xpath_variable struct xpath_variable_boolean: xpath_variable
{ {
xpath_variable_boolean(): value(false) xpath_variable_boolean(): xpath_variable(xpath_type_boolean), value(false)
{ {
} }
@ -7636,7 +7636,7 @@ PUGI__NS_BEGIN
struct xpath_variable_number: xpath_variable struct xpath_variable_number: xpath_variable
{ {
xpath_variable_number(): value(0) xpath_variable_number(): xpath_variable(xpath_type_number), value(0)
{ {
} }
@ -7646,7 +7646,7 @@ PUGI__NS_BEGIN
struct xpath_variable_string: xpath_variable struct xpath_variable_string: xpath_variable
{ {
xpath_variable_string(): value(0) xpath_variable_string(): xpath_variable(xpath_type_string), value(0)
{ {
} }
@ -7661,6 +7661,10 @@ PUGI__NS_BEGIN
struct xpath_variable_node_set: xpath_variable struct xpath_variable_node_set: xpath_variable
{ {
xpath_variable_node_set(): xpath_variable(xpath_type_node_set)
{
}
xpath_node_set value; xpath_node_set value;
char_t name[1]; char_t name[1];
}; };
@ -11080,7 +11084,8 @@ namespace pugi
PUGI__FN xpath_node_set::~xpath_node_set() PUGI__FN xpath_node_set::~xpath_node_set()
{ {
if (_begin != &_storage) impl::xml_memory::deallocate(_begin); if (_begin != &_storage)
impl::xml_memory::deallocate(_begin);
} }
PUGI__FN xpath_node_set::xpath_node_set(const xpath_node_set& ns): _type(type_unsorted), _begin(&_storage), _end(&_storage) PUGI__FN xpath_node_set::xpath_node_set(const xpath_node_set& ns): _type(type_unsorted), _begin(&_storage), _end(&_storage)
@ -11152,7 +11157,7 @@ namespace pugi
return error ? error : "No error"; return error ? error : "No error";
} }
PUGI__FN xpath_variable::xpath_variable(): _type(xpath_type_none), _next(0) PUGI__FN xpath_variable::xpath_variable(xpath_value_type type_): _type(type_), _next(0)
{ {
} }
@ -11251,7 +11256,8 @@ namespace pugi
PUGI__FN xpath_variable_set::xpath_variable_set() PUGI__FN xpath_variable_set::xpath_variable_set()
{ {
for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) _data[i] = 0; for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
_data[i] = 0;
} }
PUGI__FN xpath_variable_set::~xpath_variable_set() PUGI__FN xpath_variable_set::~xpath_variable_set()
@ -11299,7 +11305,6 @@ namespace pugi
if (result) if (result)
{ {
result->_type = type;
result->_next = _data[hash]; result->_next = _data[hash];
_data[hash] = result; _data[hash] = result;

2
src/pugixml.hpp
View File

@ -1043,7 +1043,7 @@ namespace pugi
xpath_value_type _type; xpath_value_type _type;
xpath_variable* _next; xpath_variable* _next;
xpath_variable(); xpath_variable(xpath_value_type type);
// Non-copyable semantics // Non-copyable semantics
xpath_variable(const xpath_variable&); xpath_variable(const xpath_variable&);