From caf82be2c7d42f584b070cfbe36466a9e5a0437a Mon Sep 17 00:00:00 2001 From: Niels Date: Sun, 8 Feb 2015 12:53:10 +0100 Subject: [PATCH] added reverse iterators --- src/json.hpp | 1035 +++++++++++++++++++++++++++++++-------------- src/json.hpp.re2c | 78 +++- 2 files changed, 777 insertions(+), 336 deletions(-) diff --git a/src/json.hpp b/src/json.hpp index 67637134..f4ed9b88 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -84,6 +84,10 @@ class basic_json using iterator = basic_json::iterator; /// a const iterator for a basic_json container using const_iterator = basic_json::const_iterator; + // a reverse iterator for a basic_json container + using reverse_iterator = std::reverse_iterator; + /// a const reverse iterator for a basic_json container + using const_reverse_iterator = std::reverse_iterator; /////////////////////////// @@ -255,6 +259,8 @@ class basic_json std::enable_if< not std::is_same::value and not std::is_same::value and + not std::is_same::value and + not std::is_same::value and std::is_constructible::value, int>::type = 0> inline basic_json(const V& value) @@ -437,7 +443,7 @@ class basic_json : m_type(std::move(other.m_type)), m_value(std::move(other.m_value)) { - // invaludate payload + // invalidate payload other.m_type = value_t::null; other.m_value = {}; } @@ -461,23 +467,24 @@ class basic_json m_value.object = nullptr; break; } + case (value_t::array): { delete m_value.array; m_value.array = nullptr; break; } + case (value_t::string): { delete m_value.string; m_value.string = nullptr; break; } - case (value_t::null): - case (value_t::boolean): - case (value_t::number_integer): - case (value_t::number_float): + + default: { + // all other types need no specific destructor break; } } @@ -815,6 +822,38 @@ class basic_json 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 // @@ -839,10 +878,13 @@ class basic_json { return m_value.object->empty(); } - } - // all other types are nonempty - return false; + default: + { + // all other types are nonempty + return false; + } + } } /// returns the number of elements @@ -864,10 +906,13 @@ class basic_json { return m_value.object->size(); } - } - // all other types have size 1 - return 1; + default: + { + // all other types have size 1 + return 1; + } + } } /// returns the maximum possible number of elements @@ -889,10 +934,13 @@ class basic_json { return m_value.object->max_size(); } - } - // all other types have max_size 1 - return 1; + default: + { + // all other types have max_size 1 + return 1; + } + } } @@ -2618,359 +2666,704 @@ class basic_json const lexer_char_t* marker; // set up RE2C - + for (;;) { // set current to the begin of the buffer 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 <= ':') { - if (yych <= '!') { - 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; - } - } - } + { + 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 <= ':') + { + if (yych <= '!') + { + 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: - { continue; } + { + continue; + } json_parser_3: - ++buffer_re2c; + ++buffer_re2c; json_parser_4: - { return last_token = token_type::parse_error; } + { + return last_token = token_type::parse_error; + } json_parser_5: - yych = *++buffer_re2c; - goto json_parser_60; + yych = *++buffer_re2c; + goto json_parser_60; json_parser_6: - yyaccept = 0; - yych = *(marker = ++buffer_re2c); - goto json_parser_51; + yyaccept = 0; + yych = *(marker = ++buffer_re2c); + goto json_parser_51; json_parser_7: - ++buffer_re2c; - { return last_token = token_type::value_separator; } + ++buffer_re2c; + { + return last_token = token_type::value_separator; + } json_parser_9: - yych = *++buffer_re2c; - if (yych <= '/') goto json_parser_4; - if (yych <= '0') goto json_parser_49; - if (yych <= '9') goto json_parser_40; - goto json_parser_4; + yych = *++buffer_re2c; + if (yych <= '/') + { + 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: - yyaccept = 1; - yych = *(marker = ++buffer_re2c); - if (yych <= 'D') { - if (yych == '.') goto json_parser_42; - } else { - if (yych <= 'E') goto json_parser_43; - if (yych == 'e') goto json_parser_43; - } + yyaccept = 1; + yych = *(marker = ++buffer_re2c); + if (yych <= 'D') + { + if (yych == '.') + { + goto json_parser_42; + } + } + else + { + if (yych <= 'E') + { + goto json_parser_43; + } + if (yych == 'e') + { + goto json_parser_43; + } + } json_parser_11: - { return last_token = token_type::value_number; } + { + return last_token = token_type::value_number; + } json_parser_12: - yyaccept = 1; - yych = *(marker = ++buffer_re2c); - goto json_parser_41; + yyaccept = 1; + yych = *(marker = ++buffer_re2c); + goto json_parser_41; json_parser_13: - ++buffer_re2c; - { return last_token = token_type::name_separator; } + ++buffer_re2c; + { + return last_token = token_type::name_separator; + } json_parser_15: - ++buffer_re2c; - { return last_token = token_type::begin_array; } + ++buffer_re2c; + { + return last_token = token_type::begin_array; + } json_parser_17: - ++buffer_re2c; - { return last_token = token_type::end_array; } + ++buffer_re2c; + { + return last_token = token_type::end_array; + } json_parser_19: - yyaccept = 0; - yych = *(marker = ++buffer_re2c); - if (yych == 'a') goto json_parser_35; - goto json_parser_4; + yyaccept = 0; + yych = *(marker = ++buffer_re2c); + if (yych == 'a') + { + goto json_parser_35; + } + goto json_parser_4; json_parser_20: - yyaccept = 0; - yych = *(marker = ++buffer_re2c); - if (yych == 'u') goto json_parser_31; - goto json_parser_4; + yyaccept = 0; + yych = *(marker = ++buffer_re2c); + if (yych == 'u') + { + goto json_parser_31; + } + goto json_parser_4; json_parser_21: - yyaccept = 0; - yych = *(marker = ++buffer_re2c); - if (yych == 'r') goto json_parser_26; - goto json_parser_4; + yyaccept = 0; + yych = *(marker = ++buffer_re2c); + if (yych == 'r') + { + goto json_parser_26; + } + goto json_parser_4; json_parser_22: - ++buffer_re2c; - { return last_token = token_type::begin_object; } + ++buffer_re2c; + { + return last_token = token_type::begin_object; + } json_parser_24: - ++buffer_re2c; - { return last_token = token_type::end_object; } + ++buffer_re2c; + { + return last_token = token_type::end_object; + } json_parser_26: - yych = *++buffer_re2c; - if (yych == 'u') goto json_parser_28; + yych = *++buffer_re2c; + if (yych == 'u') + { + goto json_parser_28; + } json_parser_27: - buffer_re2c = marker; - if (yyaccept == 0) { - goto json_parser_4; - } else { - goto json_parser_11; - } + buffer_re2c = marker; + if (yyaccept == 0) + { + goto json_parser_4; + } + else + { + goto json_parser_11; + } json_parser_28: - yych = *++buffer_re2c; - if (yych != 'e') goto json_parser_27; - ++buffer_re2c; - { return last_token = token_type::literal_true; } + yych = *++buffer_re2c; + if (yych != 'e') + { + goto json_parser_27; + } + ++buffer_re2c; + { + return last_token = token_type::literal_true; + } json_parser_31: - yych = *++buffer_re2c; - if (yych != 'l') goto json_parser_27; - yych = *++buffer_re2c; - if (yych != 'l') goto json_parser_27; - ++buffer_re2c; - { return last_token = token_type::literal_null; } + yych = *++buffer_re2c; + if (yych != 'l') + { + goto json_parser_27; + } + yych = *++buffer_re2c; + if (yych != 'l') + { + goto json_parser_27; + } + ++buffer_re2c; + { + return last_token = token_type::literal_null; + } json_parser_35: - yych = *++buffer_re2c; - if (yych != 'l') goto json_parser_27; - yych = *++buffer_re2c; - if (yych != 's') goto json_parser_27; - yych = *++buffer_re2c; - if (yych != 'e') goto json_parser_27; - ++buffer_re2c; - { return last_token = token_type::literal_false; } + yych = *++buffer_re2c; + if (yych != 'l') + { + goto json_parser_27; + } + yych = *++buffer_re2c; + if (yych != 's') + { + 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: - yyaccept = 1; - marker = ++buffer_re2c; - yych = *buffer_re2c; + yyaccept = 1; + marker = ++buffer_re2c; + yych = *buffer_re2c; json_parser_41: - if (yybm[0+yych] & 32) { - goto json_parser_40; - } - if (yych <= 'D') { - if (yych != '.') goto json_parser_11; - } else { - if (yych <= 'E') goto json_parser_43; - if (yych == 'e') goto json_parser_43; - goto json_parser_11; - } + if (yybm[0 + yych] & 32) + { + goto json_parser_40; + } + if (yych <= 'D') + { + if (yych != '.') + { + 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: - yych = *++buffer_re2c; - if (yych <= '/') goto json_parser_27; - if (yych <= '9') goto json_parser_47; - goto json_parser_27; + yych = *++buffer_re2c; + if (yych <= '/') + { + goto json_parser_27; + } + if (yych <= '9') + { + goto json_parser_47; + } + goto json_parser_27; json_parser_43: - yych = *++buffer_re2c; - if (yych <= ',') { - if (yych != '+') 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; - } + yych = *++buffer_re2c; + if (yych <= ',') + { + if (yych != '+') + { + 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: - yych = *++buffer_re2c; - if (yych <= '/') goto json_parser_27; - if (yych >= ':') goto json_parser_27; + yych = *++buffer_re2c; + if (yych <= '/') + { + goto json_parser_27; + } + if (yych >= ':') + { + goto json_parser_27; + } json_parser_45: - ++buffer_re2c; - yych = *buffer_re2c; - if (yych <= '/') goto json_parser_11; - if (yych <= '9') goto json_parser_45; - goto json_parser_11; + ++buffer_re2c; + yych = *buffer_re2c; + if (yych <= '/') + { + goto json_parser_11; + } + if (yych <= '9') + { + goto json_parser_45; + } + goto json_parser_11; json_parser_47: - yyaccept = 1; - marker = ++buffer_re2c; - yych = *buffer_re2c; - if (yych <= 'D') { - if (yych <= '/') goto json_parser_11; - if (yych <= '9') 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; - } + yyaccept = 1; + marker = ++buffer_re2c; + yych = *buffer_re2c; + if (yych <= 'D') + { + if (yych <= '/') + { + goto json_parser_11; + } + if (yych <= '9') + { + 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: - yyaccept = 1; - yych = *(marker = ++buffer_re2c); - if (yych <= 'D') { - if (yych == '.') goto json_parser_42; - goto json_parser_11; - } else { - if (yych <= 'E') goto json_parser_43; - if (yych == 'e') goto json_parser_43; - goto json_parser_11; - } + yyaccept = 1; + yych = *(marker = ++buffer_re2c); + if (yych <= 'D') + { + if (yych == '.') + { + goto json_parser_42; + } + 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: - ++buffer_re2c; - yych = *buffer_re2c; + ++buffer_re2c; + yych = *buffer_re2c; json_parser_51: - if (yybm[0+yych] & 64) { - goto json_parser_50; - } - if (yych <= '"') goto json_parser_53; - ++buffer_re2c; - yych = *buffer_re2c; - if (yych <= 'e') { - if (yych <= '/') { - if (yych == '"') goto json_parser_50; - if (yych <= '.') goto json_parser_27; - goto json_parser_50; - } else { - if (yych <= '\\') { - if (yych <= '[') 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; - } - } - } + if (yybm[0 + yych] & 64) + { + goto json_parser_50; + } + if (yych <= '"') + { + goto json_parser_53; + } + ++buffer_re2c; + yych = *buffer_re2c; + if (yych <= 'e') + { + if (yych <= '/') + { + if (yych == '"') + { + goto json_parser_50; + } + if (yych <= '.') + { + goto json_parser_27; + } + goto json_parser_50; + } + else + { + if (yych <= '\\') + { + if (yych <= '[') + { + 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: - ++buffer_re2c; - { return last_token = token_type::value_string; } + ++buffer_re2c; + { + return last_token = token_type::value_string; + } json_parser_55: - ++buffer_re2c; - yych = *buffer_re2c; - if (yych <= '@') { - if (yych <= '/') 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; - } + ++buffer_re2c; + yych = *buffer_re2c; + if (yych <= '@') + { + if (yych <= '/') + { + 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: - ++buffer_re2c; - yych = *buffer_re2c; - if (yych <= '@') { - if (yych <= '/') 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; - } + ++buffer_re2c; + yych = *buffer_re2c; + if (yych <= '@') + { + if (yych <= '/') + { + 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: - ++buffer_re2c; - yych = *buffer_re2c; - if (yych <= '@') { - if (yych <= '/') 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; - } + ++buffer_re2c; + yych = *buffer_re2c; + if (yych <= '@') + { + if (yych <= '/') + { + 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: - ++buffer_re2c; - yych = *buffer_re2c; - if (yych <= '@') { - if (yych <= '/') goto json_parser_27; - if (yych <= '9') 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; - } + ++buffer_re2c; + yych = *buffer_re2c; + if (yych <= '@') + { + if (yych <= '/') + { + goto json_parser_27; + } + if (yych <= '9') + { + 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: - ++buffer_re2c; - yych = *buffer_re2c; + ++buffer_re2c; + yych = *buffer_re2c; json_parser_60: - if (yybm[0+yych] & 128) { - goto json_parser_59; - } - goto json_parser_2; -} + if (yybm[0 + yych] & 128) + { + goto json_parser_59; + } + goto json_parser_2; + } } } @@ -3039,7 +3432,7 @@ json_parser_60: ); } - private: + private: /// the buffer std::string buffer; /// a pointer to the next character to read from the buffer diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c index 602a7606..b280246a 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -84,6 +84,10 @@ class basic_json using iterator = basic_json::iterator; /// a const iterator for a basic_json container using const_iterator = basic_json::const_iterator; + // a reverse iterator for a basic_json container + using reverse_iterator = std::reverse_iterator; + /// a const reverse iterator for a basic_json container + using const_reverse_iterator = std::reverse_iterator; /////////////////////////// @@ -255,6 +259,8 @@ class basic_json std::enable_if< not std::is_same::value and not std::is_same::value and + not std::is_same::value and + not std::is_same::value and std::is_constructible::value, int>::type = 0> inline basic_json(const V& value) @@ -437,7 +443,7 @@ class basic_json : m_type(std::move(other.m_type)), m_value(std::move(other.m_value)) { - // invaludate payload + // invalidate payload other.m_type = value_t::null; other.m_value = {}; } @@ -461,23 +467,24 @@ class basic_json m_value.object = nullptr; break; } + case (value_t::array): { delete m_value.array; m_value.array = nullptr; break; } + case (value_t::string): { delete m_value.string; m_value.string = nullptr; break; } - case (value_t::null): - case (value_t::boolean): - case (value_t::number_integer): - case (value_t::number_float): + + default: { + // all other types need no specific destructor break; } } @@ -815,6 +822,38 @@ class basic_json 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 // @@ -839,10 +878,13 @@ class basic_json { return m_value.object->empty(); } - } - // all other types are nonempty - return false; + default: + { + // all other types are nonempty + return false; + } + } } /// returns the number of elements @@ -864,10 +906,13 @@ class basic_json { return m_value.object->size(); } - } - // all other types have size 1 - return 1; + default: + { + // all other types have size 1 + return 1; + } + } } /// returns the maximum possible number of elements @@ -889,10 +934,13 @@ class basic_json { return m_value.object->max_size(); } - } - // all other types have max_size 1 - return 1; + default: + { + // all other types have max_size 1 + return 1; + } + } } @@ -2744,7 +2792,7 @@ class basic_json ); } - private: + private: /// the buffer std::string buffer; /// a pointer to the next character to read from the buffer