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
19d550c0
Commit
19d550c0
authored
Jul 07, 2015
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new implementation for (const_)reverse_iterator to cope with issue #93
parent
12d174d4
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
680 additions
and
25 deletions
+680
-25
src/json.hpp
src/json.hpp
+155
-11
src/json.hpp.re2c
src/json.hpp.re2c
+155
-11
test/unit.cpp
test/unit.cpp
+370
-3
No files found.
src/json.hpp
View file @
19d550c0
...
...
@@ -5239,18 +5239,95 @@ class basic_json
internal_iterator
m_it
=
internal_iterator
();
};
/// a reverse random access iterator for the basic_json class
/*!
@brief a reverse random access iterator for the basic_json class
The reverse iterator is realized with the `std::reverse_iterator` adaptor.
This adaptor does not automatically inherit all functionality from the
base iterator class, so some functions need to be explicitly implemented
by either delegating them to the base class or by using the `base()`
function to access the underlying base iterator.
The following operators are implicitly inherited:
- `operator==`, `operator!=`, `operator<`, `operator<=`, `operator>`,
`operator>=`
- `operator-=`
- `operator->`, `operator*`
*/
class
reverse_iterator
:
public
std
::
reverse_iterator
<
typename
basic_json
::
iterator
>
{
public:
reverse_iterator
(
const
typename
std
::
reverse_iterator
<
typename
basic_json
::
iterator
>::
iterator_type
&
it
)
:
std
::
reverse_iterator
<
basic_json
::
iterator
>
(
it
)
{}
/// shortcut to the reverse iterator adaptor
using
base_iterator
=
std
::
reverse_iterator
<
typename
basic_json
::
iterator
>
;
reverse_iterator
(
const
std
::
reverse_iterator
<
typename
basic_json
::
iterator
>&
it
)
:
std
::
reverse_iterator
<
typename
basic_json
::
iterator
>
(
it
)
{}
/// create reverse iterator from iterator
reverse_iterator
(
const
typename
base_iterator
::
iterator_type
&
it
)
:
base_iterator
(
it
)
{}
/// create reverse iterator from base class
reverse_iterator
(
const
base_iterator
&
it
)
:
base_iterator
(
it
)
{}
/// post-increment (it++)
reverse_iterator
operator
++
(
int
)
{
return
base_iterator
::
operator
++
(
1
);
}
/// pre-increment (++it)
reverse_iterator
&
operator
++
()
{
base_iterator
::
operator
++
();
return
*
this
;
}
/// post-decrement (it--)
reverse_iterator
operator
--
(
int
)
{
return
base_iterator
::
operator
--
(
1
);
}
/// pre-decrement (--it)
reverse_iterator
&
operator
--
()
{
base_iterator
::
operator
--
();
return
*
this
;
}
/// add to iterator
reverse_iterator
&
operator
+=
(
difference_type
i
)
{
base_iterator
::
operator
+=
(
i
);
return
*
this
;
}
/// add to iterator
reverse_iterator
operator
+
(
difference_type
i
)
const
{
auto
result
=
*
this
;
result
+=
i
;
return
result
;
}
/// subtract from iterator
reverse_iterator
operator
-
(
difference_type
i
)
const
{
auto
result
=
*
this
;
result
-=
i
;
return
result
;
}
/// return difference
difference_type
operator
-
(
const
reverse_iterator
&
other
)
const
{
return
this
->
base
()
-
other
.
base
();
}
/// access to successor
reference
operator
[](
difference_type
n
)
const
{
return
*
(
this
->
operator
+
(
n
));
}
/// return the key of an object iterator
typename
object_t
::
key_type
key
()
const
...
...
@@ -5271,9 +5348,76 @@ class basic_json
class
const_reverse_iterator
:
public
std
::
reverse_iterator
<
typename
basic_json
::
const_iterator
>
{
public:
const_reverse_iterator
(
const
typename
std
::
reverse_iterator
<
typename
basic_json
::
const_iterator
>::
iterator_type
&
it
)
:
std
::
reverse_iterator
<
basic_json
::
const_iterator
>
(
it
)
{}
/// shortcut to the reverse iterator adaptor
using
base_iterator
=
std
::
reverse_iterator
<
typename
basic_json
::
const_iterator
>
;
/// create reverse iterator from iterator
const_reverse_iterator
(
const
typename
base_iterator
::
iterator_type
&
it
)
:
base_iterator
(
it
)
{}
/// create reverse iterator from base class
const_reverse_iterator
(
const
base_iterator
&
it
)
:
base_iterator
(
it
)
{}
/// post-increment (it++)
const_reverse_iterator
operator
++
(
int
)
{
return
base_iterator
::
operator
++
(
1
);
}
/// pre-increment (++it)
const_reverse_iterator
&
operator
++
()
{
base_iterator
::
operator
++
();
return
*
this
;
}
/// post-decrement (it--)
const_reverse_iterator
operator
--
(
int
)
{
return
base_iterator
::
operator
--
(
1
);
}
/// pre-decrement (--it)
const_reverse_iterator
&
operator
--
()
{
base_iterator
::
operator
--
();
return
*
this
;
}
/// add to iterator
const_reverse_iterator
&
operator
+=
(
difference_type
i
)
{
base_iterator
::
operator
+=
(
i
);
return
*
this
;
}
/// add to iterator
const_reverse_iterator
operator
+
(
difference_type
i
)
const
{
auto
result
=
*
this
;
result
+=
i
;
return
result
;
}
/// subtract from iterator
const_reverse_iterator
operator
-
(
difference_type
i
)
const
{
auto
result
=
*
this
;
result
-=
i
;
return
result
;
}
/// return difference
difference_type
operator
-
(
const
const_reverse_iterator
&
other
)
const
{
return
this
->
base
()
-
other
.
base
();
}
/// access to successor
const_reference
operator
[](
difference_type
n
)
const
{
return
*
(
this
->
operator
+
(
n
));
}
/// return the key of an object iterator
typename
object_t
::
key_type
key
()
const
...
...
src/json.hpp.re2c
View file @
19d550c0
...
...
@@ -5239,18 +5239,95 @@ class basic_json
internal_iterator m_it = internal_iterator();
};
/// a reverse random access iterator for the basic_json class
/*!
@brief a reverse random access iterator for the basic_json class
The reverse iterator is realized with the `std::reverse_iterator` adaptor.
This adaptor does not automatically inherit all functionality from the
base iterator class, so some functions need to be explicitly implemented
by either delegating them to the base class or by using the `base()`
function to access the underlying base iterator.
The following operators are implicitly inherited:
- `operator==`, `operator!=`, `operator<`, `operator<=`, `operator>`,
`operator>=`
- `operator-=`
- `operator->`, `operator*`
*/
class reverse_iterator : public std::reverse_iterator<typename basic_json::iterator>
{
public:
reverse_iterator(const typename
std::reverse_iterator<typename basic_json::iterator>::iterator_type&
it)
: std::reverse_iterator<basic_json::iterator>(it) {}
/// shortcut to the reverse iterator adaptor
using base_iterator = std::reverse_iterator<typename basic_json::iterator>;
reverse_iterator(const std::reverse_iterator<typename basic_json::iterator>& it)
: std::reverse_iterator<typename basic_json::iterator>(it)
{}
/// create reverse iterator from iterator
reverse_iterator(const typename base_iterator::iterator_type& it)
: base_iterator(it) {}
/// create reverse iterator from base class
reverse_iterator(const base_iterator& it) : base_iterator(it) {}
/// post-increment (it++)
reverse_iterator operator++(int)
{
return base_iterator::operator++(1);
}
/// pre-increment (++it)
reverse_iterator& operator++()
{
base_iterator::operator++();
return *this;
}
/// post-decrement (it--)
reverse_iterator operator--(int)
{
return base_iterator::operator--(1);
}
/// pre-decrement (--it)
reverse_iterator& operator--()
{
base_iterator::operator--();
return *this;
}
/// add to iterator
reverse_iterator& operator+=(difference_type i)
{
base_iterator::operator+=(i);
return *this;
}
/// add to iterator
reverse_iterator operator+(difference_type i) const
{
auto result = *this;
result += i;
return result;
}
/// subtract from iterator
reverse_iterator operator-(difference_type i) const
{
auto result = *this;
result -= i;
return result;
}
/// return difference
difference_type operator-(const reverse_iterator& other) const
{
return this->base() - other.base();
}
/// access to successor
reference operator[](difference_type n) const
{
return *(this->operator+(n));
}
/// return the key of an object iterator
typename object_t::key_type key() const
...
...
@@ -5271,9 +5348,76 @@ class basic_json
class const_reverse_iterator : public std::reverse_iterator<typename basic_json::const_iterator>
{
public:
const_reverse_iterator(const typename
std::reverse_iterator<typename basic_json::const_iterator>::iterator_type& it)
: std::reverse_iterator<basic_json::const_iterator>(it) {}
/// shortcut to the reverse iterator adaptor
using base_iterator = std::reverse_iterator<typename basic_json::const_iterator>;
/// create reverse iterator from iterator
const_reverse_iterator(const typename base_iterator::iterator_type& it)
: base_iterator(it) {}
/// create reverse iterator from base class
const_reverse_iterator(const base_iterator& it) : base_iterator(it) {}
/// post-increment (it++)
const_reverse_iterator operator++(int)
{
return base_iterator::operator++(1);
}
/// pre-increment (++it)
const_reverse_iterator& operator++()
{
base_iterator::operator++();
return *this;
}
/// post-decrement (it--)
const_reverse_iterator operator--(int)
{
return base_iterator::operator--(1);
}
/// pre-decrement (--it)
const_reverse_iterator& operator--()
{
base_iterator::operator--();
return *this;
}
/// add to iterator
const_reverse_iterator& operator+=(difference_type i)
{
base_iterator::operator+=(i);
return *this;
}
/// add to iterator
const_reverse_iterator operator+(difference_type i) const
{
auto result = *this;
result += i;
return result;
}
/// subtract from iterator
const_reverse_iterator operator-(difference_type i) const
{
auto result = *this;
result -= i;
return result;
}
/// return difference
difference_type operator-(const const_reverse_iterator& other) const
{
return this->base() - other.base();
}
/// access to successor
const_reference operator[](difference_type n) const
{
return *(this->operator+(n));
}
/// return the key of an object iterator
typename object_t::key_type key() const
...
...
test/unit.cpp
View file @
19d550c0
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