j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed #100

Browse source
This commit is contained in:
Niels 2015-07-06 23:21:54 +02:00
parent e070aed8a7
commit 12d174d424
3 changed files with 87 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/json.hpp
View file

@ -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
/// 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 * ();
} }
}; };

16
src/json.hpp.re2c
View file

@ -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
/// 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 * ();
} }
}; };

85
test/unit.cpp
View file

@ -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")
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")
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")
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")
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")
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")
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\n112: 112\n113: 113\n113: 113\n112: 112\n111: 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;