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
12d174d4
Commit
12d174d4
authored
Jul 06, 2015
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed #100
parent
e070aed8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
87 additions
and
30 deletions
+87
-30
src/json.hpp
src/json.hpp
+12
-4
src/json.hpp.re2c
src/json.hpp.re2c
+12
-4
test/unit.cpp
test/unit.cpp
+63
-22
No files found.
src/json.hpp
View file @
12d174d4
...
@@ -5248,16 +5248,22 @@ class basic_json
...
@@ -5248,16 +5248,22 @@ class basic_json
it
)
it
)
:
std
::
reverse_iterator
<
basic_json
::
iterator
>
(
it
)
{}
:
std
::
reverse_iterator
<
basic_json
::
iterator
>
(
it
)
{}
reverse_iterator
(
const
std
::
reverse_iterator
<
typename
basic_json
::
iterator
>&
it
)
:
std
::
reverse_iterator
<
typename
basic_json
::
iterator
>
(
it
)
{}
/// return the key of an object iterator
/// return the key of an object iterator
typename
object_t
::
key_type
key
()
const
typename
object_t
::
key_type
key
()
const
{
{
return
this
->
base
().
key
();
auto
it
=
--
this
->
base
();
return
it
.
key
();
}
}
/// return the value of an iterator
/// return the value of an iterator
reference
value
()
const
reference
value
()
const
{
{
return
this
->
base
().
operator
*
();
auto
it
=
--
this
->
base
();
return
it
.
operator
*
();
}
}
};
};
...
@@ -5272,13 +5278,15 @@ class basic_json
...
@@ -5272,13 +5278,15 @@ class basic_json
/// return the key of an object iterator
/// return the key of an object iterator
typename
object_t
::
key_type
key
()
const
typename
object_t
::
key_type
key
()
const
{
{
return
this
->
base
().
key
();
auto
it
=
--
this
->
base
();
return
it
.
key
();
}
}
/// return the value of an iterator
/// return the value of an iterator
const_reference
value
()
const
const_reference
value
()
const
{
{
return
this
->
base
().
operator
*
();
auto
it
=
--
this
->
base
();
return
it
.
operator
*
();
}
}
};
};
...
...
src/json.hpp.re2c
View file @
12d174d4
...
@@ -5248,16 +5248,22 @@ class basic_json
...
@@ -5248,16 +5248,22 @@ class basic_json
it)
it)
: std::reverse_iterator<basic_json::iterator>(it) {}
: std::reverse_iterator<basic_json::iterator>(it) {}
reverse_iterator(const std::reverse_iterator<typename basic_json::iterator>& it)
: std::reverse_iterator<typename basic_json::iterator>(it)
{}
/// return the key of an object iterator
/// return the key of an object iterator
typename object_t::key_type key() const
typename object_t::key_type key() const
{
{
return this->base().key();
auto it = --this->base();
return it.key();
}
}
/// return the value of an iterator
/// return the value of an iterator
reference value() const
reference value() const
{
{
return this->base().operator * ();
auto it = --this->base();
return it.operator * ();
}
}
};
};
...
@@ -5272,13 +5278,15 @@ class basic_json
...
@@ -5272,13 +5278,15 @@ class basic_json
/// return the key of an object iterator
/// return the key of an object iterator
typename object_t::key_type key() const
typename object_t::key_type key() const
{
{
return this->base().key();
auto it = --this->base();
return it.key();
}
}
/// return the value of an iterator
/// return the value of an iterator
const_reference value() const
const_reference value() const
{
{
return this->base().operator * ();
auto it = --this->base();
return it.operator * ();
}
}
};
};
...
...
test/unit.cpp
View file @
12d174d4
...
@@ -4093,9 +4093,9 @@ TEST_CASE("iterators")
...
@@ -4093,9 +4093,9 @@ TEST_CASE("iterators")
auto
rit
=
j
.
rend
();
auto
rit
=
j
.
rend
();
auto
crit
=
j
.
crend
();
auto
crit
=
j
.
crend
();
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK
(
rit
.
value
()
==
json
(
true
)
);
CHECK
_THROWS_AS
(
rit
.
value
(),
std
::
out_of_range
);
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK
(
crit
.
value
()
==
json
(
true
)
);
CHECK
_THROWS_AS
(
crit
.
value
(),
std
::
out_of_range
);
}
}
}
}
...
@@ -4291,9 +4291,9 @@ TEST_CASE("iterators")
...
@@ -4291,9 +4291,9 @@ TEST_CASE("iterators")
auto
rit
=
j
.
rend
();
auto
rit
=
j
.
rend
();
auto
crit
=
j
.
crend
();
auto
crit
=
j
.
crend
();
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK
(
rit
.
value
()
==
json
(
"hello world"
)
);
CHECK
_THROWS_AS
(
rit
.
value
(),
std
::
out_of_range
);
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK
(
crit
.
value
()
==
json
(
"hello world"
)
);
CHECK
_THROWS_AS
(
crit
.
value
(),
std
::
out_of_range
);
}
}
}
}
...
@@ -4478,13 +4478,6 @@ TEST_CASE("iterators")
...
@@ -4478,13 +4478,6 @@ TEST_CASE("iterators")
CHECK
(
it
.
value
()
==
json
(
1
));
CHECK
(
it
.
value
()
==
json
(
1
));
CHECK_THROWS_AS
(
cit
.
key
(),
std
::
domain_error
);
CHECK_THROWS_AS
(
cit
.
key
(),
std
::
domain_error
);
CHECK
(
cit
.
value
()
==
json
(
1
));
CHECK
(
cit
.
value
()
==
json
(
1
));
auto
rit
=
j
.
rend
();
auto
crit
=
j
.
crend
();
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK
(
rit
.
value
()
==
json
(
1
));
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK
(
crit
.
value
()
==
json
(
1
));
}
}
}
}
...
@@ -4669,13 +4662,6 @@ TEST_CASE("iterators")
...
@@ -4669,13 +4662,6 @@ TEST_CASE("iterators")
CHECK
(
it
.
value
()
==
json
(
1
));
CHECK
(
it
.
value
()
==
json
(
1
));
CHECK
(
cit
.
key
()
==
"A"
);
CHECK
(
cit
.
key
()
==
"A"
);
CHECK
(
cit
.
value
()
==
json
(
1
));
CHECK
(
cit
.
value
()
==
json
(
1
));
auto
rit
=
j
.
rend
();
auto
crit
=
j
.
crend
();
CHECK
(
rit
.
key
()
==
"A"
);
CHECK
(
rit
.
value
()
==
json
(
1
));
CHECK
(
crit
.
key
()
==
"A"
);
CHECK
(
crit
.
value
()
==
json
(
1
));
}
}
}
}
...
@@ -4871,9 +4857,9 @@ TEST_CASE("iterators")
...
@@ -4871,9 +4857,9 @@ TEST_CASE("iterators")
auto
rit
=
j
.
rend
();
auto
rit
=
j
.
rend
();
auto
crit
=
j
.
crend
();
auto
crit
=
j
.
crend
();
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK
(
rit
.
value
()
==
json
(
23
)
);
CHECK
_THROWS_AS
(
rit
.
value
(),
std
::
out_of_range
);
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK
(
crit
.
value
()
==
json
(
23
)
);
CHECK
_THROWS_AS
(
crit
.
value
(),
std
::
out_of_range
);
}
}
}
}
...
@@ -5069,9 +5055,9 @@ TEST_CASE("iterators")
...
@@ -5069,9 +5055,9 @@ TEST_CASE("iterators")
auto
rit
=
j
.
rend
();
auto
rit
=
j
.
rend
();
auto
crit
=
j
.
crend
();
auto
crit
=
j
.
crend
();
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK
(
rit
.
value
()
==
json
(
23.42
)
);
CHECK
_THROWS_AS
(
rit
.
value
(),
std
::
out_of_range
);
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK
(
crit
.
value
()
==
json
(
23.42
)
);
CHECK
_THROWS_AS
(
crit
.
value
(),
std
::
out_of_range
);
}
}
}
}
...
@@ -9277,6 +9263,61 @@ TEST_CASE("regression tests")
...
@@ -9277,6 +9263,61 @@ TEST_CASE("regression tests")
CHECK
(
static_cast
<
int
>
(
j
[
"int_1"
])
==
1
);
CHECK
(
static_cast
<
int
>
(
j
[
"int_1"
])
==
1
);
}
}
SECTION
(
"issue #93 reverse_iterator operator inheritance problem"
)
{
{
json
a
=
{
1
,
2
,
3
};
json
::
reverse_iterator
rit
=
a
.
rbegin
();
++
rit
;
CHECK
(
*
rit
==
json
(
2
));
CHECK
(
rit
.
value
()
==
json
(
2
));
}
{
json
a
=
{
1
,
2
,
3
};
json
::
reverse_iterator
rit
=
++
a
.
rbegin
();
}
{
json
a
=
{
1
,
2
,
3
};
json
::
reverse_iterator
rit
=
a
.
rbegin
();
++
rit
;
json
b
=
{
0
,
0
,
0
};
std
::
transform
(
rit
,
a
.
rend
(),
b
.
rbegin
(),
[](
json
el
)
{
return
el
;
});
CHECK
(
b
==
json
({
0
,
1
,
2
}));
}
{
// json a = {1,2,3};
// json b = {0,0,0};
// std::transform(++a.rbegin(),a.rend(),b.rbegin(),[](json el){return el;});
}
}
SECTION
(
"issue #100 - failed to iterator json object with reverse_iterator"
)
{
json
config
=
{
{
"111"
,
111
},
{
"112"
,
112
},
{
"113"
,
113
}
};
std
::
stringstream
ss
;
for
(
auto
it
=
config
.
begin
();
it
!=
config
.
end
();
++
it
)
{
ss
<<
it
.
key
()
<<
": "
<<
it
.
value
()
<<
'\n'
;
}
for
(
auto
it
=
config
.
rbegin
();
it
!=
config
.
rend
();
++
it
)
{
ss
<<
it
.
key
()
<<
": "
<<
it
.
value
()
<<
'\n'
;
}
CHECK
(
ss
.
str
()
==
"111: 111
\n
112: 112
\n
113: 113
\n
113: 113
\n
112: 112
\n
111: 111
\n
"
);
}
SECTION
(
"issue #101 - binary string causes numbers to be dumped as hex"
)
SECTION
(
"issue #101 - binary string causes numbers to be dumped as hex"
)
{
{
int64_t
number
=
10
;
int64_t
number
=
10
;
...
...
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