Skip to content

J
json
Commit 2c325932 by Niels
Options

addressed locale-issues #107

parent c9108533
Showing with 18 additions and 16 deletions
src/json.hpp
...@@ -49,6 +49,7 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation. ...@@ -49,6 +49,7 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation.
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>
#include <limits> #include <limits>
#include <locale>
#include <map> #include <map>
#include <memory> #include <memory>
#include <sstream> #include <sstream>
...@@ -6932,18 +6933,18 @@ basic_json_parser_59: ...@@ -6932,18 +6933,18 @@ basic_json_parser_59:
read past the current token. The latter case needs to be treated by the read past the current token. The latter case needs to be treated by the
caller function. caller function.
@note This function is locale-independent, see
http://stackoverflow.com/a/1333899/266378
@throw std::range_error if passed value is out of range @throw std::range_error if passed value is out of range
*/ */
long double get_number() const long double get_number() const
{ {
// conversion long double f = NAN;
typename string_t::value_type* endptr; std::stringstream ss(get_token());
const auto float_val = std::strtold(reinterpret_cast<typename string_t::const_pointer>(m_start), ss.imbue(std::locale("C"));
&endptr); ss >> f;
return f;
// return float_val if the whole number was translated and NAN
// otherwise
return (reinterpret_cast<lexer_char_t*>(endptr) == m_cursor) ? float_val : NAN;
} }
private: private:
......
src/json.hpp.re2c
...@@ -49,6 +49,7 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation. ...@@ -49,6 +49,7 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation.
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>
#include <limits> #include <limits>
#include <locale>
#include <map> #include <map>
#include <memory> #include <memory>
#include <sstream> #include <sstream>
...@@ -6238,18 +6239,18 @@ class basic_json ...@@ -6238,18 +6239,18 @@ class basic_json
read past the current token. The latter case needs to be treated by the read past the current token. The latter case needs to be treated by the
caller function. caller function.
@note This function is locale-independent, see
http://stackoverflow.com/a/1333899/266378
@throw std::range_error if passed value is out of range @throw std::range_error if passed value is out of range
*/ */
long double get_number() const long double get_number() const
{ {
// conversion long double f = NAN;
typename string_t::value_type* endptr; std::stringstream ss(get_token());
const auto float_val = std::strtold(reinterpret_cast<typename string_t::const_pointer>(m_start), ss.imbue(std::locale("C"));
&endptr); ss >> f;
return f;
// return float_val if the whole number was translated and NAN
// otherwise
return (reinterpret_cast<lexer_char_t*>(endptr) == m_cursor) ? float_val : NAN;
} }
private: private:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment