Commit caf82be2 authored by Niels's avatar Niels

added reverse iterators

parent 87c250d8
...@@ -84,6 +84,10 @@ class basic_json ...@@ -84,6 +84,10 @@ class basic_json
using iterator = basic_json::iterator; using iterator = basic_json::iterator;
/// a const iterator for a basic_json container /// a const iterator for a basic_json container
using const_iterator = basic_json::const_iterator; using const_iterator = basic_json::const_iterator;
// a reverse iterator for a basic_json container
using reverse_iterator = std::reverse_iterator<iterator>;
/// a const reverse iterator for a basic_json container
using const_reverse_iterator = std::reverse_iterator<const_iterator>;
/////////////////////////// ///////////////////////////
...@@ -255,6 +259,8 @@ class basic_json ...@@ -255,6 +259,8 @@ class basic_json
std::enable_if< std::enable_if<
not std::is_same<V, basic_json::iterator>::value and not std::is_same<V, basic_json::iterator>::value and
not std::is_same<V, basic_json::const_iterator>::value and not std::is_same<V, basic_json::const_iterator>::value and
not std::is_same<V, basic_json::reverse_iterator>::value and
not std::is_same<V, basic_json::const_reverse_iterator>::value and
std::is_constructible<basic_json, typename V::value_type>::value, int>::type std::is_constructible<basic_json, typename V::value_type>::value, int>::type
= 0> = 0>
inline basic_json(const V& value) inline basic_json(const V& value)
...@@ -437,7 +443,7 @@ class basic_json ...@@ -437,7 +443,7 @@ class basic_json
: m_type(std::move(other.m_type)), : m_type(std::move(other.m_type)),
m_value(std::move(other.m_value)) m_value(std::move(other.m_value))
{ {
// invaludate payload // invalidate payload
other.m_type = value_t::null; other.m_type = value_t::null;
other.m_value = {}; other.m_value = {};
} }
...@@ -461,23 +467,24 @@ class basic_json ...@@ -461,23 +467,24 @@ class basic_json
m_value.object = nullptr; m_value.object = nullptr;
break; break;
} }
case (value_t::array): case (value_t::array):
{ {
delete m_value.array; delete m_value.array;
m_value.array = nullptr; m_value.array = nullptr;
break; break;
} }
case (value_t::string): case (value_t::string):
{ {
delete m_value.string; delete m_value.string;
m_value.string = nullptr; m_value.string = nullptr;
break; break;
} }
case (value_t::null):
case (value_t::boolean): default:
case (value_t::number_integer):
case (value_t::number_float):
{ {
// all other types need no specific destructor
break; break;
} }
} }
...@@ -815,6 +822,38 @@ class basic_json ...@@ -815,6 +822,38 @@ class basic_json
return result; return result;
} }
/// returns a reverse iterator to the end of the container
inline reverse_iterator rbegin() const noexcept
{
reverse_iterator result(this);
result.set_end();
return result;
}
/// returns a reverse iterator to the beginning of the container
inline reverse_iterator rend() const noexcept
{
reverse_iterator result(this);
result.set_begin();
return result;
}
/// returns a const reverse iterator to the end of the container
inline const_reverse_iterator crbegin() const noexcept
{
const_reverse_iterator result(this);
result.set_end();
return result;
}
/// returns a const reverse iterator to the beginning of the container
inline const_reverse_iterator crend() const noexcept
{
const_reverse_iterator result(this);
result.set_begin();
return result;
}
////////////// //////////////
// capacity // // capacity //
...@@ -839,10 +878,13 @@ class basic_json ...@@ -839,10 +878,13 @@ class basic_json
{ {
return m_value.object->empty(); return m_value.object->empty();
} }
}
// all other types are nonempty default:
return false; {
// all other types are nonempty
return false;
}
}
} }
/// returns the number of elements /// returns the number of elements
...@@ -864,10 +906,13 @@ class basic_json ...@@ -864,10 +906,13 @@ class basic_json
{ {
return m_value.object->size(); return m_value.object->size();
} }
}
// all other types have size 1 default:
return 1; {
// all other types have size 1
return 1;
}
}
} }
/// returns the maximum possible number of elements /// returns the maximum possible number of elements
...@@ -889,10 +934,13 @@ class basic_json ...@@ -889,10 +934,13 @@ class basic_json
{ {
return m_value.object->max_size(); return m_value.object->max_size();
} }
}
// all other types have max_size 1 default:
return 1; {
// all other types have max_size 1
return 1;
}
}
} }
...@@ -2618,359 +2666,704 @@ class basic_json ...@@ -2618,359 +2666,704 @@ class basic_json
const lexer_char_t* marker; const lexer_char_t* marker;
// set up RE2C // set up RE2C
for (;;) for (;;)
{ {
// set current to the begin of the buffer // set current to the begin of the buffer
current_re2c = buffer_re2c; current_re2c = buffer_re2c;
{
lexer_char_t yych;
unsigned int yyaccept = 0;
static const unsigned char yybm[] = {
64, 64, 64, 64, 64, 64, 64, 64,
64, 192, 192, 64, 64, 192, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
192, 64, 0, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
96, 96, 96, 96, 96, 96, 96, 96,
96, 96, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 0, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
};
yych = *buffer_re2c; {
if (yych <= ':') { lexer_char_t yych;
if (yych <= '!') { unsigned int yyaccept = 0;
if (yych <= '\f') { static const unsigned char yybm[] =
if (yych <= 0x08) goto json_parser_3; {
if (yych <= '\n') goto json_parser_5; 64, 64, 64, 64, 64, 64, 64, 64,
goto json_parser_3; 64, 192, 192, 64, 64, 192, 64, 64,
} else { 64, 64, 64, 64, 64, 64, 64, 64,
if (yych <= '\r') goto json_parser_5; 64, 64, 64, 64, 64, 64, 64, 64,
if (yych == ' ') goto json_parser_5; 192, 64, 0, 64, 64, 64, 64, 64,
goto json_parser_3; 64, 64, 64, 64, 64, 64, 64, 64,
} 96, 96, 96, 96, 96, 96, 96, 96,
} else { 96, 96, 64, 64, 64, 64, 64, 64,
if (yych <= '-') { 64, 64, 64, 64, 64, 64, 64, 64,
if (yych <= '"') goto json_parser_6; 64, 64, 64, 64, 64, 64, 64, 64,
if (yych <= '+') goto json_parser_3; 64, 64, 64, 64, 64, 64, 64, 64,
if (yych <= ',') goto json_parser_7; 64, 64, 64, 64, 0, 64, 64, 64,
goto json_parser_9; 64, 64, 64, 64, 64, 64, 64, 64,
} else { 64, 64, 64, 64, 64, 64, 64, 64,
if (yych <= '/') goto json_parser_3; 64, 64, 64, 64, 64, 64, 64, 64,
if (yych <= '0') goto json_parser_10; 64, 64, 64, 64, 64, 64, 64, 64,
if (yych <= '9') goto json_parser_12; 64, 64, 64, 64, 64, 64, 64, 64,
goto json_parser_13; 64, 64, 64, 64, 64, 64, 64, 64,
} 64, 64, 64, 64, 64, 64, 64, 64,
} 64, 64, 64, 64, 64, 64, 64, 64,
} else { 64, 64, 64, 64, 64, 64, 64, 64,
if (yych <= 'm') { 64, 64, 64, 64, 64, 64, 64, 64,
if (yych <= '\\') { 64, 64, 64, 64, 64, 64, 64, 64,
if (yych == '[') goto json_parser_15; 64, 64, 64, 64, 64, 64, 64, 64,
goto json_parser_3; 64, 64, 64, 64, 64, 64, 64, 64,
} else { 64, 64, 64, 64, 64, 64, 64, 64,
if (yych <= ']') goto json_parser_17; 64, 64, 64, 64, 64, 64, 64, 64,
if (yych == 'f') goto json_parser_19; 64, 64, 64, 64, 64, 64, 64, 64,
goto json_parser_3; 64, 64, 64, 64, 64, 64, 64, 64,
} 64, 64, 64, 64, 64, 64, 64, 64,
} else { 64, 64, 64, 64, 64, 64, 64, 64,
if (yych <= 'z') { 64, 64, 64, 64, 64, 64, 64, 64,
if (yych <= 'n') goto json_parser_20; };
if (yych == 't') goto json_parser_21;
goto json_parser_3; yych = *buffer_re2c;
} else { if (yych <= ':')
if (yych <= '{') goto json_parser_22; {
if (yych == '}') goto json_parser_24; if (yych <= '!')
goto json_parser_3; {
} if (yych <= '\f')
} {
} if (yych <= 0x08)
{
goto json_parser_3;
}
if (yych <= '\n')
{
goto json_parser_5;
}
goto json_parser_3;
}
else
{
if (yych <= '\r')
{
goto json_parser_5;
}
if (yych == ' ')
{
goto json_parser_5;
}
goto json_parser_3;
}
}
else
{
if (yych <= '-')
{
if (yych <= '"')
{
goto json_parser_6;
}
if (yych <= '+')
{
goto json_parser_3;
}
if (yych <= ',')
{
goto json_parser_7;
}
goto json_parser_9;
}
else
{
if (yych <= '/')
{
goto json_parser_3;
}
if (yych <= '0')
{
goto json_parser_10;
}
if (yych <= '9')
{
goto json_parser_12;
}
goto json_parser_13;
}
}
}
else
{
if (yych <= 'm')
{
if (yych <= '\\')
{
if (yych == '[')
{
goto json_parser_15;
}
goto json_parser_3;
}
else
{
if (yych <= ']')
{
goto json_parser_17;
}
if (yych == 'f')
{
goto json_parser_19;
}
goto json_parser_3;
}
}
else
{
if (yych <= 'z')
{
if (yych <= 'n')
{
goto json_parser_20;
}
if (yych == 't')
{
goto json_parser_21;
}
goto json_parser_3;
}
else
{
if (yych <= '{')
{
goto json_parser_22;
}
if (yych == '}')
{
goto json_parser_24;
}
goto json_parser_3;
}
}
}
json_parser_2: json_parser_2:
{ continue; } {
continue;
}
json_parser_3: json_parser_3:
++buffer_re2c; ++buffer_re2c;
json_parser_4: json_parser_4:
{ return last_token = token_type::parse_error; } {
return last_token = token_type::parse_error;
}
json_parser_5: json_parser_5:
yych = *++buffer_re2c; yych = *++buffer_re2c;
goto json_parser_60; goto json_parser_60;
json_parser_6: json_parser_6:
yyaccept = 0; yyaccept = 0;
yych = *(marker = ++buffer_re2c); yych = *(marker = ++buffer_re2c);
goto json_parser_51; goto json_parser_51;
json_parser_7: json_parser_7:
++buffer_re2c; ++buffer_re2c;
{ return last_token = token_type::value_separator; } {
return last_token = token_type::value_separator;
}
json_parser_9: json_parser_9:
yych = *++buffer_re2c; yych = *++buffer_re2c;
if (yych <= '/') goto json_parser_4; if (yych <= '/')
if (yych <= '0') goto json_parser_49; {
if (yych <= '9') goto json_parser_40; goto json_parser_4;
goto json_parser_4; }
if (yych <= '0')
{
goto json_parser_49;
}
if (yych <= '9')
{
goto json_parser_40;
}
goto json_parser_4;
json_parser_10: json_parser_10:
yyaccept = 1; yyaccept = 1;
yych = *(marker = ++buffer_re2c); yych = *(marker = ++buffer_re2c);
if (yych <= 'D') { if (yych <= 'D')
if (yych == '.') goto json_parser_42; {
} else { if (yych == '.')
if (yych <= 'E') goto json_parser_43; {
if (yych == 'e') goto json_parser_43; goto json_parser_42;
} }
}
else
{
if (yych <= 'E')
{
goto json_parser_43;
}
if (yych == 'e')
{
goto json_parser_43;
}
}
json_parser_11: json_parser_11:
{ return last_token = token_type::value_number; } {
return last_token = token_type::value_number;
}
json_parser_12: json_parser_12:
yyaccept = 1; yyaccept = 1;
yych = *(marker = ++buffer_re2c); yych = *(marker = ++buffer_re2c);
goto json_parser_41; goto json_parser_41;
json_parser_13: json_parser_13:
++buffer_re2c; ++buffer_re2c;
{ return last_token = token_type::name_separator; } {
return last_token = token_type::name_separator;
}
json_parser_15: json_parser_15:
++buffer_re2c; ++buffer_re2c;
{ return last_token = token_type::begin_array; } {
return last_token = token_type::begin_array;
}
json_parser_17: json_parser_17:
++buffer_re2c; ++buffer_re2c;
{ return last_token = token_type::end_array; } {
return last_token = token_type::end_array;
}
json_parser_19: json_parser_19:
yyaccept = 0; yyaccept = 0;
yych = *(marker = ++buffer_re2c); yych = *(marker = ++buffer_re2c);
if (yych == 'a') goto json_parser_35; if (yych == 'a')
goto json_parser_4; {
goto json_parser_35;
}
goto json_parser_4;
json_parser_20: json_parser_20:
yyaccept = 0; yyaccept = 0;
yych = *(marker = ++buffer_re2c); yych = *(marker = ++buffer_re2c);
if (yych == 'u') goto json_parser_31; if (yych == 'u')
goto json_parser_4; {
goto json_parser_31;
}
goto json_parser_4;
json_parser_21: json_parser_21:
yyaccept = 0; yyaccept = 0;
yych = *(marker = ++buffer_re2c); yych = *(marker = ++buffer_re2c);
if (yych == 'r') goto json_parser_26; if (yych == 'r')
goto json_parser_4; {
goto json_parser_26;
}
goto json_parser_4;
json_parser_22: json_parser_22:
++buffer_re2c; ++buffer_re2c;
{ return last_token = token_type::begin_object; } {
return last_token = token_type::begin_object;
}
json_parser_24: json_parser_24:
++buffer_re2c; ++buffer_re2c;
{ return last_token = token_type::end_object; } {
return last_token = token_type::end_object;
}
json_parser_26: json_parser_26:
yych = *++buffer_re2c; yych = *++buffer_re2c;
if (yych == 'u') goto json_parser_28; if (yych == 'u')
{
goto json_parser_28;
}
json_parser_27: json_parser_27:
buffer_re2c = marker; buffer_re2c = marker;
if (yyaccept == 0) { if (yyaccept == 0)
goto json_parser_4; {
} else { goto json_parser_4;
goto json_parser_11; }
} else
{
goto json_parser_11;
}
json_parser_28: json_parser_28:
yych = *++buffer_re2c; yych = *++buffer_re2c;
if (yych != 'e') goto json_parser_27; if (yych != 'e')
++buffer_re2c; {
{ return last_token = token_type::literal_true; } goto json_parser_27;
}
++buffer_re2c;
{
return last_token = token_type::literal_true;
}
json_parser_31: json_parser_31:
yych = *++buffer_re2c; yych = *++buffer_re2c;
if (yych != 'l') goto json_parser_27; if (yych != 'l')
yych = *++buffer_re2c; {
if (yych != 'l') goto json_parser_27; goto json_parser_27;
++buffer_re2c; }
{ return last_token = token_type::literal_null; } yych = *++buffer_re2c;
if (yych != 'l')
{
goto json_parser_27;
}
++buffer_re2c;
{
return last_token = token_type::literal_null;
}
json_parser_35: json_parser_35:
yych = *++buffer_re2c; yych = *++buffer_re2c;
if (yych != 'l') goto json_parser_27; if (yych != 'l')
yych = *++buffer_re2c; {
if (yych != 's') goto json_parser_27; goto json_parser_27;
yych = *++buffer_re2c; }
if (yych != 'e') goto json_parser_27; yych = *++buffer_re2c;
++buffer_re2c; if (yych != 's')
{ return last_token = token_type::literal_false; } {
goto json_parser_27;
}
yych = *++buffer_re2c;
if (yych != 'e')
{
goto json_parser_27;
}
++buffer_re2c;
{
return last_token = token_type::literal_false;
}
json_parser_40: json_parser_40:
yyaccept = 1; yyaccept = 1;
marker = ++buffer_re2c; marker = ++buffer_re2c;
yych = *buffer_re2c; yych = *buffer_re2c;
json_parser_41: json_parser_41:
if (yybm[0+yych] & 32) { if (yybm[0 + yych] & 32)
goto json_parser_40; {
} goto json_parser_40;
if (yych <= 'D') { }
if (yych != '.') goto json_parser_11; if (yych <= 'D')
} else { {
if (yych <= 'E') goto json_parser_43; if (yych != '.')
if (yych == 'e') goto json_parser_43; {
goto json_parser_11; goto json_parser_11;
} }
}
else
{
if (yych <= 'E')
{
goto json_parser_43;
}
if (yych == 'e')
{
goto json_parser_43;
}
goto json_parser_11;
}
json_parser_42: json_parser_42:
yych = *++buffer_re2c; yych = *++buffer_re2c;
if (yych <= '/') goto json_parser_27; if (yych <= '/')
if (yych <= '9') goto json_parser_47; {
goto json_parser_27; goto json_parser_27;
}
if (yych <= '9')
{
goto json_parser_47;
}
goto json_parser_27;
json_parser_43: json_parser_43:
yych = *++buffer_re2c; yych = *++buffer_re2c;
if (yych <= ',') { if (yych <= ',')
if (yych != '+') goto json_parser_27; {
} else { if (yych != '+')
if (yych <= '-') goto json_parser_44; {
if (yych <= '/') goto json_parser_27; goto json_parser_27;
if (yych <= '9') goto json_parser_45; }
goto json_parser_27; }
} else
{
if (yych <= '-')
{
goto json_parser_44;
}
if (yych <= '/')
{
goto json_parser_27;
}
if (yych <= '9')
{
goto json_parser_45;
}
goto json_parser_27;
}
json_parser_44: json_parser_44:
yych = *++buffer_re2c; yych = *++buffer_re2c;
if (yych <= '/') goto json_parser_27; if (yych <= '/')
if (yych >= ':') goto json_parser_27; {
goto json_parser_27;
}
if (yych >= ':')
{
goto json_parser_27;
}
json_parser_45: json_parser_45:
++buffer_re2c; ++buffer_re2c;
yych = *buffer_re2c; yych = *buffer_re2c;
if (yych <= '/') goto json_parser_11; if (yych <= '/')
if (yych <= '9') goto json_parser_45; {
goto json_parser_11; goto json_parser_11;
}
if (yych <= '9')
{
goto json_parser_45;
}
goto json_parser_11;
json_parser_47: json_parser_47:
yyaccept = 1; yyaccept = 1;
marker = ++buffer_re2c; marker = ++buffer_re2c;
yych = *buffer_re2c; yych = *buffer_re2c;
if (yych <= 'D') { if (yych <= 'D')
if (yych <= '/') goto json_parser_11; {
if (yych <= '9') goto json_parser_47; if (yych <= '/')
goto json_parser_11; {
} else { goto json_parser_11;
if (yych <= 'E') goto json_parser_43; }
if (yych == 'e') goto json_parser_43; if (yych <= '9')
goto json_parser_11; {
} goto json_parser_47;
}
goto json_parser_11;
}
else
{
if (yych <= 'E')
{
goto json_parser_43;
}
if (yych == 'e')
{
goto json_parser_43;
}
goto json_parser_11;
}
json_parser_49: json_parser_49:
yyaccept = 1; yyaccept = 1;
yych = *(marker = ++buffer_re2c); yych = *(marker = ++buffer_re2c);
if (yych <= 'D') { if (yych <= 'D')
if (yych == '.') goto json_parser_42; {
goto json_parser_11; if (yych == '.')
} else { {
if (yych <= 'E') goto json_parser_43; goto json_parser_42;
if (yych == 'e') goto json_parser_43; }
goto json_parser_11; goto json_parser_11;
} }
else
{
if (yych <= 'E')
{
goto json_parser_43;
}
if (yych == 'e')
{
goto json_parser_43;
}
goto json_parser_11;
}
json_parser_50: json_parser_50:
++buffer_re2c; ++buffer_re2c;
yych = *buffer_re2c; yych = *buffer_re2c;
json_parser_51: json_parser_51:
if (yybm[0+yych] & 64) { if (yybm[0 + yych] & 64)
goto json_parser_50; {
} goto json_parser_50;
if (yych <= '"') goto json_parser_53; }
++buffer_re2c; if (yych <= '"')
yych = *buffer_re2c; {
if (yych <= 'e') { goto json_parser_53;
if (yych <= '/') { }
if (yych == '"') goto json_parser_50; ++buffer_re2c;
if (yych <= '.') goto json_parser_27; yych = *buffer_re2c;
goto json_parser_50; if (yych <= 'e')
} else { {
if (yych <= '\\') { if (yych <= '/')
if (yych <= '[') goto json_parser_27; {
goto json_parser_50; if (yych == '"')
} else { {
if (yych == 'b') goto json_parser_50; goto json_parser_50;
goto json_parser_27; }
} if (yych <= '.')
} {
} else { goto json_parser_27;
if (yych <= 'q') { }
if (yych <= 'f') goto json_parser_50; goto json_parser_50;
if (yych == 'n') goto json_parser_50; }
goto json_parser_27; else
} else { {
if (yych <= 's') { if (yych <= '\\')
if (yych <= 'r') goto json_parser_50; {
goto json_parser_27; if (yych <= '[')
} else { {
if (yych <= 't') goto json_parser_50; goto json_parser_27;
if (yych <= 'u') goto json_parser_55; }
goto json_parser_27; goto json_parser_50;
} }
} else
} {
if (yych == 'b')
{
goto json_parser_50;
}
goto json_parser_27;
}
}
}
else
{
if (yych <= 'q')
{
if (yych <= 'f')
{
goto json_parser_50;
}
if (yych == 'n')
{
goto json_parser_50;
}
goto json_parser_27;
}
else
{
if (yych <= 's')
{
if (yych <= 'r')
{
goto json_parser_50;
}
goto json_parser_27;
}
else
{
if (yych <= 't')
{
goto json_parser_50;
}
if (yych <= 'u')
{
goto json_parser_55;
}
goto json_parser_27;
}
}
}
json_parser_53: json_parser_53:
++buffer_re2c; ++buffer_re2c;
{ return last_token = token_type::value_string; } {
return last_token = token_type::value_string;
}
json_parser_55: json_parser_55:
++buffer_re2c; ++buffer_re2c;
yych = *buffer_re2c; yych = *buffer_re2c;
if (yych <= '@') { if (yych <= '@')
if (yych <= '/') goto json_parser_27; {
if (yych >= ':') goto json_parser_27; if (yych <= '/')
} else { {
if (yych <= 'F') goto json_parser_56; goto json_parser_27;
if (yych <= '`') goto json_parser_27; }
if (yych >= 'g') goto json_parser_27; if (yych >= ':')
} {
goto json_parser_27;
}
}
else
{
if (yych <= 'F')
{
goto json_parser_56;
}
if (yych <= '`')
{
goto json_parser_27;
}
if (yych >= 'g')
{
goto json_parser_27;
}
}
json_parser_56: json_parser_56:
++buffer_re2c; ++buffer_re2c;
yych = *buffer_re2c; yych = *buffer_re2c;
if (yych <= '@') { if (yych <= '@')
if (yych <= '/') goto json_parser_27; {
if (yych >= ':') goto json_parser_27; if (yych <= '/')
} else { {
if (yych <= 'F') goto json_parser_57; goto json_parser_27;
if (yych <= '`') goto json_parser_27; }
if (yych >= 'g') goto json_parser_27; if (yych >= ':')
} {
goto json_parser_27;
}
}
else
{
if (yych <= 'F')
{
goto json_parser_57;
}
if (yych <= '`')
{
goto json_parser_27;
}
if (yych >= 'g')
{
goto json_parser_27;
}
}
json_parser_57: json_parser_57:
++buffer_re2c; ++buffer_re2c;
yych = *buffer_re2c; yych = *buffer_re2c;
if (yych <= '@') { if (yych <= '@')
if (yych <= '/') goto json_parser_27; {
if (yych >= ':') goto json_parser_27; if (yych <= '/')
} else { {
if (yych <= 'F') goto json_parser_58; goto json_parser_27;
if (yych <= '`') goto json_parser_27; }
if (yych >= 'g') goto json_parser_27; if (yych >= ':')
} {
goto json_parser_27;
}
}
else
{
if (yych <= 'F')
{
goto json_parser_58;
}
if (yych <= '`')
{
goto json_parser_27;
}
if (yych >= 'g')
{
goto json_parser_27;
}
}
json_parser_58: json_parser_58:
++buffer_re2c; ++buffer_re2c;
yych = *buffer_re2c; yych = *buffer_re2c;
if (yych <= '@') { if (yych <= '@')
if (yych <= '/') goto json_parser_27; {
if (yych <= '9') goto json_parser_50; if (yych <= '/')
goto json_parser_27; {
} else { goto json_parser_27;
if (yych <= 'F') goto json_parser_50; }
if (yych <= '`') goto json_parser_27; if (yych <= '9')
if (yych <= 'f') goto json_parser_50; {
goto json_parser_27; goto json_parser_50;
} }
goto json_parser_27;
}
else
{
if (yych <= 'F')
{
goto json_parser_50;
}
if (yych <= '`')
{
goto json_parser_27;
}
if (yych <= 'f')
{
goto json_parser_50;
}
goto json_parser_27;
}
json_parser_59: json_parser_59:
++buffer_re2c; ++buffer_re2c;
yych = *buffer_re2c; yych = *buffer_re2c;
json_parser_60: json_parser_60:
if (yybm[0+yych] & 128) { if (yybm[0 + yych] & 128)
goto json_parser_59; {
} goto json_parser_59;
goto json_parser_2; }
} goto json_parser_2;
}
} }
} }
...@@ -3039,7 +3432,7 @@ json_parser_60: ...@@ -3039,7 +3432,7 @@ json_parser_60:
); );
} }
private: private:
/// the buffer /// the buffer
std::string buffer; std::string buffer;
/// a pointer to the next character to read from the buffer /// a pointer to the next character to read from the buffer
......
...@@ -84,6 +84,10 @@ class basic_json ...@@ -84,6 +84,10 @@ class basic_json
using iterator = basic_json::iterator; using iterator = basic_json::iterator;
/// a const iterator for a basic_json container /// a const iterator for a basic_json container
using const_iterator = basic_json::const_iterator; using const_iterator = basic_json::const_iterator;
// a reverse iterator for a basic_json container
using reverse_iterator = std::reverse_iterator<iterator>;
/// a const reverse iterator for a basic_json container
using const_reverse_iterator = std::reverse_iterator<const_iterator>;
/////////////////////////// ///////////////////////////
...@@ -255,6 +259,8 @@ class basic_json ...@@ -255,6 +259,8 @@ class basic_json
std::enable_if< std::enable_if<
not std::is_same<V, basic_json::iterator>::value and not std::is_same<V, basic_json::iterator>::value and
not std::is_same<V, basic_json::const_iterator>::value and not std::is_same<V, basic_json::const_iterator>::value and
not std::is_same<V, basic_json::reverse_iterator>::value and
not std::is_same<V, basic_json::const_reverse_iterator>::value and
std::is_constructible<basic_json, typename V::value_type>::value, int>::type std::is_constructible<basic_json, typename V::value_type>::value, int>::type
= 0> = 0>
inline basic_json(const V& value) inline basic_json(const V& value)
...@@ -437,7 +443,7 @@ class basic_json ...@@ -437,7 +443,7 @@ class basic_json
: m_type(std::move(other.m_type)), : m_type(std::move(other.m_type)),
m_value(std::move(other.m_value)) m_value(std::move(other.m_value))
{ {
// invaludate payload // invalidate payload
other.m_type = value_t::null; other.m_type = value_t::null;
other.m_value = {}; other.m_value = {};
} }
...@@ -461,23 +467,24 @@ class basic_json ...@@ -461,23 +467,24 @@ class basic_json
m_value.object = nullptr; m_value.object = nullptr;
break; break;
} }
case (value_t::array): case (value_t::array):
{ {
delete m_value.array; delete m_value.array;
m_value.array = nullptr; m_value.array = nullptr;
break; break;
} }
case (value_t::string): case (value_t::string):
{ {
delete m_value.string; delete m_value.string;
m_value.string = nullptr; m_value.string = nullptr;
break; break;
} }
case (value_t::null):
case (value_t::boolean): default:
case (value_t::number_integer):
case (value_t::number_float):
{ {
// all other types need no specific destructor
break; break;
} }
} }
...@@ -815,6 +822,38 @@ class basic_json ...@@ -815,6 +822,38 @@ class basic_json
return result; return result;
} }
/// returns a reverse iterator to the end of the container
inline reverse_iterator rbegin() const noexcept
{
reverse_iterator result(this);
result.set_end();
return result;
}
/// returns a reverse iterator to the beginning of the container
inline reverse_iterator rend() const noexcept
{
reverse_iterator result(this);
result.set_begin();
return result;
}
/// returns a const reverse iterator to the end of the container
inline const_reverse_iterator crbegin() const noexcept
{
const_reverse_iterator result(this);
result.set_end();
return result;
}
/// returns a const reverse iterator to the beginning of the container
inline const_reverse_iterator crend() const noexcept
{
const_reverse_iterator result(this);
result.set_begin();
return result;
}
////////////// //////////////
// capacity // // capacity //
...@@ -839,10 +878,13 @@ class basic_json ...@@ -839,10 +878,13 @@ class basic_json
{ {
return m_value.object->empty(); return m_value.object->empty();
} }
}
// all other types are nonempty default:
return false; {
// all other types are nonempty
return false;
}
}
} }
/// returns the number of elements /// returns the number of elements
...@@ -864,10 +906,13 @@ class basic_json ...@@ -864,10 +906,13 @@ class basic_json
{ {
return m_value.object->size(); return m_value.object->size();
} }
}
// all other types have size 1 default:
return 1; {
// all other types have size 1
return 1;
}
}
} }
/// returns the maximum possible number of elements /// returns the maximum possible number of elements
...@@ -889,10 +934,13 @@ class basic_json ...@@ -889,10 +934,13 @@ class basic_json
{ {
return m_value.object->max_size(); return m_value.object->max_size();
} }
}
// all other types have max_size 1 default:
return 1; {
// all other types have max_size 1
return 1;
}
}
} }
...@@ -2744,7 +2792,7 @@ class basic_json ...@@ -2744,7 +2792,7 @@ class basic_json
); );
} }
private: private:
/// the buffer /// the buffer
std::string buffer; std::string buffer;
/// a pointer to the next character to read from the buffer /// a pointer to the next character to read from the buffer
......
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