Skip to content

J
json
Commit 18cd30d3 authored by Niels's avatar Niels
Browse files
Options

minor iterator refactoring (from #88)

parent 23c904ac
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 84 deletions
src/json.hpp
View file @ 18cd30d3
...@@ -3116,27 +3116,7 @@ class basic_json ...@@ -3116,27 +3116,7 @@ class basic_json
const_iterator operator++(int) const_iterator operator++(int)
{ {
auto result = *this; auto result = *this;
++(*this);
switch (m_object->m_type)
{
case (basic_json::value_t::object):
{
m_it.object_iterator++;
break;
}
case (basic_json::value_t::array):
{
m_it.array_iterator++;
break;
}
default:
{
m_it.generic_iterator++;
break;
}
}
return result; return result;
} }
...@@ -3172,27 +3152,7 @@ class basic_json ...@@ -3172,27 +3152,7 @@ class basic_json
const_iterator operator--(int) const_iterator operator--(int)
{ {
auto result = *this; auto result = *this;
--(*this);
switch (m_object->m_type)
{
case (basic_json::value_t::object):
{
m_it.object_iterator--;
break;
}
case (basic_json::value_t::array):
{
m_it.array_iterator--;
break;
}
default:
{
m_it.generic_iterator--;
break;
}
}
return result; return result;
} }
......
src/json.hpp.re2c
View file @ 18cd30d3
...@@ -3116,27 +3116,7 @@ class basic_json ...@@ -3116,27 +3116,7 @@ class basic_json
const_iterator operator++(int) const_iterator operator++(int)
{ {
auto result = *this; auto result = *this;
++(*this);
switch (m_object->m_type)
{
case (basic_json::value_t::object):
{
m_it.object_iterator++;
break;
}
case (basic_json::value_t::array):
{
m_it.array_iterator++;
break;
}
default:
{
m_it.generic_iterator++;
break;
}
}
return result; return result;
} }
...@@ -3172,27 +3152,7 @@ class basic_json ...@@ -3172,27 +3152,7 @@ class basic_json
const_iterator operator--(int) const_iterator operator--(int)
{ {
auto result = *this; auto result = *this;
--(*this);
switch (m_object->m_type)
{
case (basic_json::value_t::object):
{
m_it.object_iterator--;
break;
}
case (basic_json::value_t::array):
{
m_it.array_iterator--;
break;
}
default:
{
m_it.generic_iterator--;
break;
}
}
return result; return result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment