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
a8e92a6b
Commit
a8e92a6b
authored
May 06, 2015
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed #68
parent
17609f24
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
34 deletions
+28
-34
src/json.hpp
src/json.hpp
+14
-17
src/json.hpp.re2c
src/json.hpp.re2c
+14
-17
No files found.
src/json.hpp
View file @
a8e92a6b
...
...
@@ -2333,13 +2333,12 @@ class basic_json
///////////////
/// an iterator value
template
<
typename
array_iterator_t
,
typename
object_iterator_t
>
union
internal_iterator
{
/// iterator for JSON objects
object_iterator_t
object_iterator
;
typename
object_t
::
iterator
object_iterator
;
/// iterator for JSON arrays
array_iterator_t
array_iterator
;
typename
array_t
::
iterator
array_iterator
;
/// generic iteraotr for all other value types
difference_type
generic_iterator
;
...
...
@@ -2401,9 +2400,8 @@ class basic_json
inline
iterator
&
operator
=
(
iterator
other
)
noexcept
(
std
::
is_nothrow_move_constructible
<
pointer
>::
value
and
std
::
is_nothrow_move_assignable
<
pointer
>::
value
and
std
::
is_nothrow_move_constructible
<
internal_iterator
<
typename
array_t
::
iterator
,
typename
object_t
::
iterator
>>::
value
and
std
::
is_nothrow_move_assignable
<
internal_iterator
<
typename
array_t
::
iterator
,
typename
object_t
::
iterator
>>::
value
std
::
is_nothrow_move_constructible
<
internal_iterator
>::
value
and
std
::
is_nothrow_move_assignable
<
internal_iterator
>::
value
)
{
std
::
swap
(
m_object
,
other
.
m_object
);
...
...
@@ -2862,7 +2860,7 @@ class basic_json
/// associated JSON instance
pointer
m_object
=
nullptr
;
/// the actual iterator of the associated instance
internal_iterator
<
typename
array_t
::
iterator
,
typename
object_t
::
iterator
>
m_it
;
internal_iterator
m_it
;
};
/// a const random access iterator for the basic_json class
...
...
@@ -2893,12 +2891,12 @@ class basic_json
{
case
(
basic_json
:
:
value_t
::
object
)
:
{
m_it
.
object_iterator
=
typename
object_t
::
const_
iterator
();
m_it
.
object_iterator
=
typename
object_t
::
iterator
();
break
;
}
case
(
basic_json
:
:
value_t
::
array
)
:
{
m_it
.
array_iterator
=
typename
array_t
::
const_
iterator
();
m_it
.
array_iterator
=
typename
array_t
::
iterator
();
break
;
}
default:
...
...
@@ -2943,9 +2941,8 @@ class basic_json
inline
const_iterator
&
operator
=
(
const_iterator
other
)
noexcept
(
std
::
is_nothrow_move_constructible
<
pointer
>::
value
and
std
::
is_nothrow_move_assignable
<
pointer
>::
value
and
std
::
is_nothrow_move_constructible
<
internal_iterator
<
typename
array_t
::
const_iterator
,
typename
object_t
::
const_iterator
>>::
value
and
std
::
is_nothrow_move_assignable
<
internal_iterator
<
typename
array_t
::
const_iterator
,
typename
object_t
::
const_iterator
>>::
value
std
::
is_nothrow_move_constructible
<
internal_iterator
>::
value
and
std
::
is_nothrow_move_assignable
<
internal_iterator
>::
value
)
{
std
::
swap
(
m_object
,
other
.
m_object
);
...
...
@@ -2961,13 +2958,13 @@ class basic_json
{
case
(
basic_json
:
:
value_t
::
object
)
:
{
m_it
.
object_iterator
=
m_object
->
m_value
.
object
->
c
begin
();
m_it
.
object_iterator
=
m_object
->
m_value
.
object
->
begin
();
break
;
}
case
(
basic_json
:
:
value_t
::
array
)
:
{
m_it
.
array_iterator
=
m_object
->
m_value
.
array
->
c
begin
();
m_it
.
array_iterator
=
m_object
->
m_value
.
array
->
begin
();
break
;
}
...
...
@@ -2993,13 +2990,13 @@ class basic_json
{
case
(
basic_json
:
:
value_t
::
object
)
:
{
m_it
.
object_iterator
=
m_object
->
m_value
.
object
->
c
end
();
m_it
.
object_iterator
=
m_object
->
m_value
.
object
->
end
();
break
;
}
case
(
basic_json
:
:
value_t
::
array
)
:
{
m_it
.
array_iterator
=
m_object
->
m_value
.
array
->
c
end
();
m_it
.
array_iterator
=
m_object
->
m_value
.
array
->
end
();
break
;
}
...
...
@@ -3398,7 +3395,7 @@ class basic_json
/// associated JSON instance
pointer
m_object
=
nullptr
;
/// the actual iterator of the associated instance
internal_iterator
<
typename
array_t
::
const_iterator
,
typename
object_t
::
const_iterator
>
m_it
;
internal_iterator
m_it
;
};
/// a reverse random access iterator for the basic_json class
...
...
src/json.hpp.re2c
View file @
a8e92a6b
...
...
@@ -2333,13 +2333,12 @@ class basic_json
///////////////
/// an iterator value
template<typename array_iterator_t, typename object_iterator_t>
union internal_iterator
{
/// iterator for JSON objects
object_iterator_t
object_iterator;
typename object_t::iterator
object_iterator;
/// iterator for JSON arrays
array_iterator_t
array_iterator;
typename array_t::iterator
array_iterator;
/// generic iteraotr for all other value types
difference_type generic_iterator;
...
...
@@ -2401,9 +2400,8 @@ class basic_json
inline iterator& operator=(iterator other) noexcept (
std::is_nothrow_move_constructible<pointer>::value and
std::is_nothrow_move_assignable<pointer>::value and
std::is_nothrow_move_constructible<internal_iterator<typename array_t::iterator, typename object_t::iterator>>::value
and
std::is_nothrow_move_assignable<internal_iterator<typename array_t::iterator, typename object_t::iterator>>::value
std::is_nothrow_move_constructible<internal_iterator>::value and
std::is_nothrow_move_assignable<internal_iterator>::value
)
{
std::swap(m_object, other.m_object);
...
...
@@ -2862,7 +2860,7 @@ class basic_json
/// associated JSON instance
pointer m_object = nullptr;
/// the actual iterator of the associated instance
internal_iterator
<typename array_t::iterator, typename object_t::iterator>
m_it;
internal_iterator m_it;
};
/// a const random access iterator for the basic_json class
...
...
@@ -2893,12 +2891,12 @@ class basic_json
{
case (basic_json::value_t::object):
{
m_it.object_iterator = typename object_t::
const_
iterator();
m_it.object_iterator = typename object_t::iterator();
break;
}
case (basic_json::value_t::array):
{
m_it.array_iterator = typename array_t::
const_
iterator();
m_it.array_iterator = typename array_t::iterator();
break;
}
default:
...
...
@@ -2943,9 +2941,8 @@ class basic_json
inline const_iterator& operator=(const_iterator other) noexcept(
std::is_nothrow_move_constructible<pointer>::value and
std::is_nothrow_move_assignable<pointer>::value and
std::is_nothrow_move_constructible<internal_iterator<typename array_t::const_iterator, typename object_t::const_iterator>>::value
and
std::is_nothrow_move_assignable<internal_iterator<typename array_t::const_iterator, typename object_t::const_iterator>>::value
std::is_nothrow_move_constructible<internal_iterator>::value and
std::is_nothrow_move_assignable<internal_iterator>::value
)
{
std::swap(m_object, other.m_object);
...
...
@@ -2961,13 +2958,13 @@ class basic_json
{
case (basic_json::value_t::object):
{
m_it.object_iterator = m_object->m_value.object->
c
begin();
m_it.object_iterator = m_object->m_value.object->begin();
break;
}
case (basic_json::value_t::array):
{
m_it.array_iterator = m_object->m_value.array->
c
begin();
m_it.array_iterator = m_object->m_value.array->begin();
break;
}
...
...
@@ -2993,13 +2990,13 @@ class basic_json
{
case (basic_json::value_t::object):
{
m_it.object_iterator = m_object->m_value.object->
c
end();
m_it.object_iterator = m_object->m_value.object->end();
break;
}
case (basic_json::value_t::array):
{
m_it.array_iterator = m_object->m_value.array->
c
end();
m_it.array_iterator = m_object->m_value.array->end();
break;
}
...
...
@@ -3398,7 +3395,7 @@ class basic_json
/// associated JSON instance
pointer m_object = nullptr;
/// the actual iterator of the associated instance
internal_iterator
<typename array_t::const_iterator, typename object_t::const_iterator>
m_it;
internal_iterator m_it;
};
/// a reverse random access iterator for the basic_json class
...
...
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