j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

minor adjustments to pull request #38

Browse source
This commit is contained in:
Niels 2015-03-23 20:27:30 +01:00
parent a382a93a8e
commit 53e3da8071
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/json.hpp
View file

@ -32,6 +32,7 @@ iterators allow a ReversibleContainer to be iterated over in reverse.
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
#include <cstdio>
#include <functional> #include <functional>
#include <initializer_list> #include <initializer_list>
#include <iomanip> #include <iomanip>
@ -1882,7 +1883,8 @@ class basic_json
recursively. Note that recursively. Note that
- strings and object keys are escaped using escape_string() - strings and object keys are escaped using escape_string()
- integer numbers are converted to a string before output using std::to_string() - integer numbers are converted to a string before output using
std::to_string()
- floating-point numbers are converted to a string using "%g" format - floating-point numbers are converted to a string using "%g" format
@param prettyPrint whether the output shall be pretty-printed @param prettyPrint whether the output shall be pretty-printed
@ -1991,12 +1993,12 @@ class basic_json
case (value_t::number_float): case (value_t::number_float):
{ {
// 15 digits of precision allows round-trip IEEE 754 string->double->string // 15 digits of precision allows round-trip IEEE 754
unsigned int sz = (unsigned int)std::snprintf(nullptr, 0, "%.15g", m_value.number_float); // string->double->string
const auto sz = static_cast<unsigned int>(std::snprintf(nullptr, 0, "%.15g", m_value.number_float));
std::vector<char> buf(sz + 1); std::vector<char> buf(sz + 1);
std::snprintf(&buf[0], buf.size(), "%.15g", m_value.number_float); std::snprintf(&buf[0], buf.size(), "%.15g", m_value.number_float);
string_t formatted = buf.data(); return string_t(buf.data());
return formatted;
} }
default: default:

12
src/json.hpp.re2c
View file

@ -32,6 +32,7 @@ iterators allow a ReversibleContainer to be iterated over in reverse.
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
#include <cstdio>
#include <functional> #include <functional>
#include <initializer_list> #include <initializer_list>
#include <iomanip> #include <iomanip>
@ -1882,7 +1883,9 @@ class basic_json
recursively. Note that recursively. Note that
- strings and object keys are escaped using escape_string() - strings and object keys are escaped using escape_string()
- numbers are converted to a string before output using std::to_string() - integer numbers are converted to a string before output using
std::to_string()
- floating-point numbers are converted to a string using "%g" format
@param prettyPrint whether the output shall be pretty-printed @param prettyPrint whether the output shall be pretty-printed
@param indentStep the indent level @param indentStep the indent level
@ -1990,7 +1993,12 @@ class basic_json
case (value_t::number_float): case (value_t::number_float):
{ {
return std::to_string(m_value.number_float); // 15 digits of precision allows round-trip IEEE 754
// string->double->string
const auto sz = static_cast<unsigned int>(std::snprintf(nullptr, 0, "%.15g", m_value.number_float));
std::vector<char> buf(sz + 1);
std::snprintf(&buf[0], buf.size(), "%.15g", m_value.number_float);
return string_t(buf.data());
} }
default: default: