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
27b44cb1
Unverified
Commit
27b44cb1
authored
4 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue2615' of
https://github.com/nlohmann/json
into develop
parents
9f6b78ee
ffdeb774
develop
bon8
coverity_scan
gcc_warning_flags
icpc
issue2932
issue3232_use_catch
master
release/3.10.2
release/3.10.3
release/3.10.4
release/3.10.5
string_view
string_view2
update_doctest
v3.10.5
v3.10.4
v3.10.3
v3.10.2
v3.10.1
v3.10.0
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
120 additions
and
128 deletions
+120
-128
include/nlohmann/detail/conversions/to_chars.hpp
include/nlohmann/detail/conversions/to_chars.hpp
+11
-13
include/nlohmann/detail/input/input_adapters.hpp
include/nlohmann/detail/input/input_adapters.hpp
+2
-4
include/nlohmann/detail/input/parser.hpp
include/nlohmann/detail/input/parser.hpp
+46
-46
include/nlohmann/detail/iterators/iteration_proxy.hpp
include/nlohmann/detail/iterators/iteration_proxy.hpp
+1
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+60
-64
No files found.
include/nlohmann/detail/conversions/to_chars.hpp
View file @
27b44cb1
...
...
@@ -490,51 +490,49 @@ inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
return
10
;
}
// LCOV_EXCL_STOP
else
if
(
n
>=
100000000
)
if
(
n
>=
100000000
)
{
pow10
=
100000000
;
return
9
;
}
else
if
(
n
>=
10000000
)
if
(
n
>=
10000000
)
{
pow10
=
10000000
;
return
8
;
}
else
if
(
n
>=
1000000
)
if
(
n
>=
1000000
)
{
pow10
=
1000000
;
return
7
;
}
else
if
(
n
>=
100000
)
if
(
n
>=
100000
)
{
pow10
=
100000
;
return
6
;
}
else
if
(
n
>=
10000
)
if
(
n
>=
10000
)
{
pow10
=
10000
;
return
5
;
}
else
if
(
n
>=
1000
)
if
(
n
>=
1000
)
{
pow10
=
1000
;
return
4
;
}
else
if
(
n
>=
100
)
if
(
n
>=
100
)
{
pow10
=
100
;
return
3
;
}
else
if
(
n
>=
10
)
if
(
n
>=
10
)
{
pow10
=
10
;
return
2
;
}
else
{
pow10
=
1
;
return
1
;
}
}
inline
void
grisu2_round
(
char
*
buf
,
int
len
,
std
::
uint64_t
dist
,
std
::
uint64_t
delta
,
...
...
This diff is collapsed.
Click to expand it.
include/nlohmann/detail/input/input_adapters.hpp
View file @
27b44cb1
...
...
@@ -135,11 +135,9 @@ class iterator_input_adapter
std
::
advance
(
current
,
1
);
return
result
;
}
else
{
return
std
::
char_traits
<
char_type
>::
eof
();
}
}
private:
IteratorType
current
;
...
...
This diff is collapsed.
Click to expand it.
include/nlohmann/detail/input/parser.hpp
View file @
27b44cb1
...
...
@@ -393,8 +393,9 @@ class parser
parse_error
::
create
(
101
,
m_lexer
.
get_position
(),
exception_message
(
token_type
::
end_array
,
"array"
)));
}
else
// object
{
// states.back() is false -> object
// comma -> next value
if
(
get_token
()
==
token_type
::
value_separator
)
{
...
...
@@ -450,7 +451,6 @@ class parser
exception_message
(
token_type
::
end_object
,
"object"
)));
}
}
}
/// get next token from lexer
token_type
get_token
()
...
...
This diff is collapsed.
Click to expand it.
include/nlohmann/detail/iterators/iteration_proxy.hpp
View file @
27b44cb1
...
...
@@ -39,7 +39,7 @@ template<typename IteratorType> class iteration_proxy_value
/// a string representation of the array index
mutable
string_type
array_index_str
=
"0"
;
/// an empty string (to return a reference for primitive values)
const
string_type
empty_str
=
""
;
const
string_type
empty_str
;
public:
explicit
iteration_proxy_value
(
IteratorType
it
)
noexcept
:
anchor
(
it
)
{}
...
...
This diff is collapsed.
Click to expand it.
single_include/nlohmann/json.hpp
View file @
27b44cb1
...
...
@@ -3944,7 +3944,7 @@ template<typename IteratorType> class iteration_proxy_value
/// a string representation of the array index
mutable
string_type
array_index_str
=
"0"
;
/// an empty string (to return a reference for primitive values)
const
string_type
empty_str
=
""
;
const
string_type
empty_str
;
public:
explicit
iteration_proxy_value
(
IteratorType
it
)
noexcept
:
anchor
(
it
)
{}
...
...
@@ -4947,11 +4947,9 @@ class iterator_input_adapter
std
::
advance
(
current
,
1
);
return
result
;
}
else
{
return
std
::
char_traits
<
char_type
>::
eof
();
}
}
private:
IteratorType
current
;
...
...
@@ -10618,8 +10616,9 @@ class parser
parse_error
::
create
(
101
,
m_lexer
.
get_position
(),
exception_message
(
token_type
::
end_array
,
"array"
)));
}
else
// object
{
// states.back() is false -> object
// comma -> next value
if
(
get_token
()
==
token_type
::
value_separator
)
{
...
...
@@ -10675,7 +10674,6 @@ class parser
exception_message
(
token_type
::
end_object
,
"object"
)));
}
}
}
/// get next token from lexer
token_type
get_token
()
...
...
@@ -14948,51 +14946,49 @@ inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
return
10
;
}
// LCOV_EXCL_STOP
else
if
(
n
>=
100000000
)
if
(
n
>=
100000000
)
{
pow10
=
100000000
;
return
9
;
}
else
if
(
n
>=
10000000
)
if
(
n
>=
10000000
)
{
pow10
=
10000000
;
return
8
;
}
else
if
(
n
>=
1000000
)
if
(
n
>=
1000000
)
{
pow10
=
1000000
;
return
7
;
}
else
if
(
n
>=
100000
)
if
(
n
>=
100000
)
{
pow10
=
100000
;
return
6
;
}
else
if
(
n
>=
10000
)
if
(
n
>=
10000
)
{
pow10
=
10000
;
return
5
;
}
else
if
(
n
>=
1000
)
if
(
n
>=
1000
)
{
pow10
=
1000
;
return
4
;
}
else
if
(
n
>=
100
)
if
(
n
>=
100
)
{
pow10
=
100
;
return
3
;
}
else
if
(
n
>=
10
)
if
(
n
>=
10
)
{
pow10
=
10
;
return
2
;
}
else
{
pow10
=
1
;
return
1
;
}
}
inline
void
grisu2_round
(
char
*
buf
,
int
len
,
std
::
uint64_t
dist
,
std
::
uint64_t
delta
,
...
...
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