Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
bd0cb65b
Commit
bd0cb65b
authored
10 years ago
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed more float parsing cases
parent
7c579f11
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
18 deletions
+20
-18
src/json.hpp
src/json.hpp
+8
-7
src/json.hpp.re2c
src/json.hpp.re2c
+8
-7
test/unit.cpp
test/unit.cpp
+4
-4
No files found.
src/json.hpp
View file @
bd0cb65b
...
...
@@ -2283,8 +2283,9 @@ class basic_json
case
(
value_t
:
:
number_float
)
:
{
// 15 digits of precision allows round-trip IEEE 754
// string->double->string
o
<<
std
::
setprecision
(
15
)
<<
m_value
.
number_float
;
// string->double->string; to be safe, we read this value from
// std::numeric_limits<number_float_t>::digits10
o
<<
std
::
setprecision
(
std
::
numeric_limits
<
number_float_t
>::
digits10
)
<<
m_value
.
number_float
;
return
;
}
...
...
@@ -4547,12 +4548,12 @@ basic_json_parser_59:
@exception std::range_error if passed value is out of range
*/
number_float_t
get_number
()
const
long
double
get_number
()
const
{
// conversion
typename
string_t
::
value_type
*
endptr
;
const
auto
float_val
=
std
::
strtod
(
reinterpret_cast
<
typename
string_t
::
const_pointer
>
(
m_start
),
&
endptr
);
const
auto
float_val
=
std
::
strto
l
d
(
reinterpret_cast
<
typename
string_t
::
const_pointer
>
(
m_start
),
&
endptr
);
// return float_val if the whole number was translated and NAN
// otherwise
...
...
@@ -4787,7 +4788,7 @@ basic_json_parser_59:
// check if conversion loses precision
const
auto
int_val
=
static_cast
<
number_integer_t
>
(
float_val
);
if
(
approx
(
float_val
,
static_cast
<
number_float_t
>
(
int_val
)))
if
(
approx
(
float_val
,
static_cast
<
long
double
>
(
int_val
)))
{
// we basic_json not lose precision -> return int
result
.
m_type
=
value_t
::
number_integer
;
...
...
@@ -4797,7 +4798,7 @@ basic_json_parser_59:
{
// we would lose precision -> returnfloat
result
.
m_type
=
value_t
::
number_float
;
result
.
m_value
=
float_val
;
result
.
m_value
=
static_cast
<
number_float_t
>
(
float_val
)
;
}
break
;
}
...
...
This diff is collapsed.
Click to expand it.
src/json.hpp.re2c
View file @
bd0cb65b
...
...
@@ -2283,8 +2283,9 @@ class basic_json
case (value_t::number_float):
{
// 15 digits of precision allows round-trip IEEE 754
// string->double->string
o << std::setprecision(15) << m_value.number_float;
// string->double->string; to be safe, we read this value from
// std::numeric_limits<number_float_t>::digits10
o << std::setprecision(std::numeric_limits<number_float_t>::digits10) << m_value.number_float;
return;
}
...
...
@@ -3853,12 +3854,12 @@ class basic_json
@exception std::range_error if passed value is out of range
*/
number_float_t
get_number() const
long double
get_number() const
{
// conversion
typename string_t::value_type* endptr;
const auto float_val = std::strtod(reinterpret_cast<typename string_t::const_pointer>(m_start),
&endptr);
const auto float_val = std::strto
l
d(reinterpret_cast<typename string_t::const_pointer>(m_start),
&endptr);
// return float_val if the whole number was translated and NAN
// otherwise
...
...
@@ -4093,7 +4094,7 @@ class basic_json
// check if conversion loses precision
const auto int_val = static_cast<number_integer_t>(float_val);
if (approx(float_val, static_cast<
number_float_t
>(int_val)))
if (approx(float_val, static_cast<
long double
>(int_val)))
{
// we basic_json not lose precision -> return int
result.m_type = value_t::number_integer;
...
...
@@ -4103,7 +4104,7 @@ class basic_json
{
// we would lose precision -> returnfloat
result.m_type = value_t::number_float;
result.m_value =
float_val
;
result.m_value =
static_cast<number_float_t>(float_val)
;
}
break;
}
...
...
This diff is collapsed.
Click to expand it.
test/unit.cpp
View file @
bd0cb65b
...
...
@@ -8688,13 +8688,13 @@ TEST_CASE("compliance tests from nativejson-benchmark")
"test/json_roundtrip/roundtrip10.json",
"test/json_roundtrip/roundtrip11.json",
"test/json_roundtrip/roundtrip12.json",
//
"test/json_roundtrip/roundtrip13.json",
"test/json_roundtrip/roundtrip13.json",
"test/json_roundtrip/roundtrip14.json",
"test/json_roundtrip/roundtrip15.json",
"test/json_roundtrip/roundtrip16.json",
"test/json_roundtrip/roundtrip17.json",
//
"test/json_roundtrip/roundtrip18.json",
//
"test/json_roundtrip/roundtrip19.json",
"test/json_roundtrip/roundtrip18.json",
"test/json_roundtrip/roundtrip19.json",
//"test/json_roundtrip/roundtrip20.json",
//"test/json_roundtrip/roundtrip21.json",
"test/json_roundtrip/roundtrip22.json",
...
...
@@ -8708,7 +8708,7 @@ TEST_CASE("compliance tests from nativejson-benchmark")
CAPTURE(filename);
std::ifstream f(filename);
std::string json_string( (std::istreambuf_iterator<char>(f) ),
(std::istreambuf_iterator<char>()
) );
(std::istreambuf_iterator<char>()) );
json j = json::parse(json_string);
CHECK(j.dump() == json_string);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment