sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rapidxml: avoid overhead of stringstream - amends 95d5b73

Browse source
This commit is contained in:
Dane Springmeyer 2014-08-20 13:46:00 -07:00
parent aa11335e70
commit b9060c038c
1 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/rapidxml_loader.cpp
View file

@ -60,12 +60,6 @@ public:
{
throw config_error("Could not load map file", 0, filename);
}
// TODO: stream.imbue(loc);
load(stream, node);
}
void load(std::basic_istream<char> &stream, xml_node &node)
{
stream.unsetf(std::ios::skipws);
std::vector<char> v(std::istreambuf_iterator<char>(stream.rdbuf()),
std::istreambuf_iterator<char>());
@ -74,6 +68,12 @@ public:
throw config_error("Could not load map file", 0, filename_);
}
v.push_back(0); // zero-terminate
load_array(v, node);
}
template <typename T>
void load_array(T && array, xml_node & node)
{
try
{
// Parse using appropriate flags
@ -81,7 +81,7 @@ public:
// const int f_tws = rapidxml::parse_normalize_whitespace;
const int f_tws = rapidxml::parse_trim_whitespace | rapidxml::parse_validate_closing_tags;
rapidxml::xml_document<> doc;
doc.parse<f_tws>(&v.front());
doc.parse<f_tws>(&array.front());
for (rapidxml::xml_node<char> *child = doc.first_node();
child; child = child->next_sibling())
@ -92,26 +92,14 @@ public:
catch (rapidxml::parse_error const& e)
{
long line = static_cast<long>(
std::count(&v.front(), e.where<char>(), '\n') + 1);
std::count(&array.front(), e.where<char>(), '\n') + 1);
throw config_error(e.what(), line, filename_);
}
}
void load_string(std::string const& buffer, xml_node &node, std::string const & base_path )
{
// if (!base_path.empty())
// {
// if (!mapnik::util::exists(base_path)) {
// throw config_error(std::string("Could not locate base_path '") +
// base_path + "': file or directory does not exist");
// }
// }
// https://github.com/mapnik/mapnik/issues/1857
std::stringstream s;
s << buffer;
load(s, node);
load_array(std::string(buffer), node);
}
private:
void populate_tree(rapidxml::xml_node<char> *cur_node, xml_node &node)