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
d187488e
Unverified
Commit
d187488e
authored
Oct 05, 2019
by
Niels Lohmann
Committed by
GitHub
Oct 05, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1765 from crazyjul/fix/items-with-alt-string
Allow items() to be used with custom string
parents
dae0fe79
4615f5a9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
8 deletions
+54
-8
include/nlohmann/detail/iterators/iteration_proxy.hpp
include/nlohmann/detail/iterators/iteration_proxy.hpp
+10
-4
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+10
-4
test/src/unit-alt-string.cpp
test/src/unit-alt-string.cpp
+34
-0
No files found.
include/nlohmann/detail/iterators/iteration_proxy.hpp
View file @
d187488e
...
...
@@ -12,6 +12,11 @@ namespace nlohmann
{
namespace
detail
{
template
<
typename
string_type
>
void
int_to_string
(
string_type
&
target
,
int
value
)
{
target
=
std
::
to_string
(
value
);
}
template
<
typename
IteratorType
>
class
iteration_proxy_value
{
public:
...
...
@@ -20,6 +25,7 @@ template <typename IteratorType> class iteration_proxy_value
using
pointer
=
value_type
*
;
using
reference
=
value_type
&
;
using
iterator_category
=
std
::
input_iterator_tag
;
using
string_type
=
typename
std
::
remove_cv
<
typename
std
::
remove_reference
<
decltype
(
std
::
declval
<
IteratorType
>
().
key
()
)
>::
type
>::
type
;
private:
/// the iterator
...
...
@@ -29,9 +35,9 @@ template <typename IteratorType> class iteration_proxy_value
/// last stringified array index
mutable
std
::
size_t
array_index_last
=
0
;
/// a string representation of the array index
mutable
st
d
::
string
array_index_str
=
"0"
;
mutable
st
ring_type
array_index_str
=
"0"
;
/// an empty string (to return a reference for primitive values)
const
st
d
::
string
empty_str
=
""
;
const
st
ring_type
empty_str
=
""
;
public:
explicit
iteration_proxy_value
(
IteratorType
it
)
noexcept
:
anchor
(
it
)
{}
...
...
@@ -64,7 +70,7 @@ template <typename IteratorType> class iteration_proxy_value
}
/// return key of the iterator
const
st
d
::
string
&
key
()
const
const
st
ring_type
&
key
()
const
{
assert
(
anchor
.
m_object
!=
nullptr
);
...
...
@@ -75,7 +81,7 @@ template <typename IteratorType> class iteration_proxy_value
{
if
(
array_index
!=
array_index_last
)
{
array_index_str
=
std
::
to_string
(
array_index
);
int_to_string
(
array_index_str
,
array_index
);
array_index_last
=
array_index
;
}
return
array_index_str
;
...
...
single_include/nlohmann/json.hpp
View file @
d187488e
...
...
@@ -3186,6 +3186,11 @@ namespace nlohmann
{
namespace
detail
{
template
<
typename
string_type
>
void
int_to_string
(
string_type
&
target
,
int
value
)
{
target
=
std
::
to_string
(
value
);
}
template
<
typename
IteratorType
>
class
iteration_proxy_value
{
public:
...
...
@@ -3194,6 +3199,7 @@ template <typename IteratorType> class iteration_proxy_value
using
pointer
=
value_type
*
;
using
reference
=
value_type
&
;
using
iterator_category
=
std
::
input_iterator_tag
;
using
string_type
=
typename
std
::
remove_cv
<
typename
std
::
remove_reference
<
decltype
(
std
::
declval
<
IteratorType
>
().
key
()
)
>::
type
>::
type
;
private:
/// the iterator
...
...
@@ -3203,9 +3209,9 @@ template <typename IteratorType> class iteration_proxy_value
/// last stringified array index
mutable
std
::
size_t
array_index_last
=
0
;
/// a string representation of the array index
mutable st
d::string
array_index_str = "0";
mutable
st
ring_type
array_index_str
=
"0"
;
/// an empty string (to return a reference for primitive values)
const st
d::string
empty_str = "";
const
st
ring_type
empty_str
=
""
;
public:
explicit
iteration_proxy_value
(
IteratorType
it
)
noexcept
:
anchor
(
it
)
{}
...
...
@@ -3238,7 +3244,7 @@ template <typename IteratorType> class iteration_proxy_value
}
/// return key of the iterator
const st
d::string
& key() const
const
st
ring_type
&
key
()
const
{
assert
(
anchor
.
m_object
!=
nullptr
);
...
...
@@ -3249,7 +3255,7 @@ template <typename IteratorType> class iteration_proxy_value
{
if
(
array_index
!=
array_index_last
)
{
array_index_str = std::to_string(array_index
);
int_to_string
(
array_index_str
,
array_index
);
array_index_last
=
array_index
;
}
return
array_index_str
;
...
...
test/src/unit-alt-string.cpp
View file @
d187488e
...
...
@@ -154,6 +154,11 @@ class alt_string
friend
bool
::
operator
<
(
const
char
*
,
const
alt_string
&
);
};
void
int_to_string
(
alt_string
&
target
,
int
value
)
{
target
=
std
::
to_string
(
value
).
c_str
();
}
using
alt_json
=
nlohmann
::
basic_json
<
std
::
map
,
std
::
vector
,
...
...
@@ -232,6 +237,35 @@ TEST_CASE("alternative string type")
CHECK
(
dump
==
R"({"foo":"bar"})"
);
}
SECTION
(
"items"
)
{
auto
doc
=
alt_json
::
parse
(
"{
\"
foo
\"
:
\"
bar
\"
}"
);
for
(
auto
item
:
doc
.
items
()
)
{
CHECK
(
item
.
key
()
==
"foo"
);
CHECK
(
item
.
value
()
==
"bar"
);
}
auto
doc_array
=
alt_json
::
parse
(
"[
\"
foo
\"
,
\"
bar
\"
]"
);
for
(
auto
item
:
doc_array
.
items
()
)
{
if
(
item
.
key
()
==
"0"
)
{
CHECK
(
item
.
value
()
==
"foo"
);
}
else
if
(
item
.
key
()
==
"1"
)
{
CHECK
(
item
.
value
()
==
"bar"
);
}
else
{
CHECK
(
false
);
}
}
}
SECTION
(
"equality"
)
{
alt_json
doc
;
...
...
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