adrido/minetest-mapper-cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve parsing of textual block ID (i64 or axyz)

Browse Source 
- Accept trailing spaces
- Fix error detection (use 'fail()' instead of 'bad()')
This commit is contained in:
Rogier 2016-01-13 10:27:42 +01:00
parent 570ed84fd2
commit f908282a16
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BlockPos.cpp
View File

@ -7,8 +7,8 @@ void BlockPos::operator=(const std::string &s)
std::istringstream is(s);
if (isdigit(is.peek()) || is.peek() == '-' || is.peek() == '+') {
int64_t ipos;
is >> ipos;
if (is.bad() || !is.eof()) {
is >> ipos >> std::ws;
if (is.fail() || !is.eof()) {
throw std::runtime_error(std::string("Failed to decode i64 (minetest) coordinate string from database (") + s + ")" );
}
operator=(ipos);
@ -23,7 +23,8 @@ void BlockPos::operator=(const std::string &s)
is >> y();
is >> c2;
is >> z();
if (is.bad() || !is.eof() || c1 != ',' || c2 != ',') {
is >> std::ws;
if (is.fail() || !is.eof() || c1 != ',' || c2 != ',') {
throw std::runtime_error(std::string("Failed to decode axyz (freeminer) coordinate string from database (") + s + ")" );
}
m_strFormat = AXYZ;