diff --git a/src/json.hpp b/src/json.hpp index 7114fdfe..b83a0331 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -58,16 +58,15 @@ namespace nlohmann // Helper to determine whether there's a key_type for T. // http://stackoverflow.com/a/7728728/266378 template -struct has_key_type +struct has_mapped_type { private: - template static char test(typename C::key_type*); + template static char test(typename C::mapped_type*); template static int test(...); public: enum { value = sizeof(test(0)) == sizeof(char) }; }; - /*! @brief JSON @@ -814,7 +813,7 @@ class basic_json return m_type; } - + private: ////////////////////// // value conversion // ////////////////////// @@ -822,89 +821,206 @@ class basic_json /// get an object (explicit) template ::value and - std::is_constructible::value, int>::type - = 0> - inline T get() const + std::is_convertible::value and + std::is_convertible::value + , int>::type = 0> + inline T get_impl(T*) const { switch (m_type) { case (value_t::object): + { return T(m_value.object->begin(), m_value.object->end()); + } default: + { throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name()); + } + } + } + + /// get an object (explicit) + inline object_t get_impl(object_t*) const + { + switch (m_type) + { + case (value_t::object): + { + return *(m_value.object); + } + default: + { + throw std::logic_error("cannot cast " + type_name() + " to object"); + } } } /// get an array (explicit) template ::value and - not has_key_type::value and - std::is_constructible::value, int>::type - = 0> - inline T get() const + std::is_convertible::value and + not std::is_same::value and + not std::is_arithmetic::value and + not std::is_convertible::value and + not has_mapped_type::value + , int>::type = 0> + inline T get_impl(T*) const { switch (m_type) { case (value_t::array): - return T(m_value.array->begin(), m_value.array->end()); + { + T to_vector; + //to_vector.reserve(m_value.array->size()); + std::transform(m_value.array->begin(), m_value.array->end(), + std::inserter(to_vector, to_vector.end()), [](basic_json i) + { + return i.get(); + }); + return to_vector; + + // return T(m_value.array->begin(), m_value.array->end()); + } default: + { throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name()); + } + } + } + + /// get an array (explicit) + template ::value and + not std::is_same::value + , int>::type = 0> + inline std::vector get_impl(std::vector*) const + { + switch (m_type) + { + case (value_t::array): + { + std::vector to_vector; + to_vector.reserve(m_value.array->size()); + std::transform(m_value.array->begin(), m_value.array->end(), + std::inserter(to_vector, to_vector.end()), [](basic_json i) + { + return i.get(); + }); + return to_vector; + } + default: + { + throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name()); + } + } + } + + /// get an array (explicit) + template ::value and + not has_mapped_type::value + , int>::type = 0> + inline T get_impl(T*) const + { + switch (m_type) + { + case (value_t::array): + { + return T(m_value.array->begin(), m_value.array->end()); + } + default: + { + throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name()); + } + } + } + + inline array_t get_impl(array_t*) const + { + switch (m_type) + { + case (value_t::array): + { + return *(m_value.array); + } + default: + { + throw std::logic_error("cannot cast " + type_name() + " to array"); + } } } /// get a string (explicit) template ::value, int>::type - = 0> - inline T get() const + std::is_convertible::value + , int>::type = 0> + inline T get_impl(T*) const { switch (m_type) { case (value_t::string): + { return *m_value.string; + } default: + { throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name()); - } - } - - /// get a boolean (explicit) - template ::value, int>::type - = 0> - inline T get() const - { - switch (m_type) - { - case (value_t::boolean): - return m_value.boolean; - default: - throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name()); + } } } /// get a number (explicit) template::value and - std::is_arithmetic::value, int>::type - = 0> - inline T get() const + std::is_arithmetic::value + , int>::type = 0> + inline T get_impl(T*) const { switch (m_type) { case (value_t::number_integer): + { return static_cast(m_value.number_integer); + } case (value_t::number_float): + { return static_cast(m_value.number_float); + } default: + { throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name()); + } } } + /// get a boolean (explicit) + inline boolean_t get_impl(boolean_t*) const + { + switch (m_type) + { + case (value_t::boolean): + { + return m_value.boolean; + } + default: + { + throw std::logic_error("cannot cast " + type_name() + " to " + typeid(boolean_t).name()); + } + } + } + + public: + /// get a value (explicit) + // + template + inline T get() const + { + return get_impl(static_cast(nullptr)); + } + /// get a value (implicit) template inline operator T() const @@ -1077,7 +1193,7 @@ class basic_json // at only works for objects if (m_type != value_t::object) { - throw std::runtime_error("cannot use at with " + type_name()); + throw std::runtime_error("cannot use erase with " + type_name()); } return m_value.object->erase(key); @@ -3371,369 +3487,758 @@ class basic_json // remember the begin of the token m_start = m_cursor; - - { - lexer_char_t yych; - unsigned int yyaccept = 0; - static const unsigned char yybm[] = { - 0, 64, 64, 64, 64, 64, 64, 64, - 64, 96, 96, 64, 64, 96, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, - 96, 64, 0, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, - 192, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 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, - }; - if ((m_limit - m_cursor) < 5) { yyfill(); }; - yych = *m_cursor; - if (yych <= '9') { - if (yych <= ' ') { - if (yych <= '\n') { - if (yych <= 0x00) goto basic_json_parser_27; - if (yych <= 0x08) goto basic_json_parser_29; - if (yych >= '\n') goto basic_json_parser_4; - } else { - if (yych == '\r') goto basic_json_parser_2; - if (yych <= 0x1F) goto basic_json_parser_29; + { + lexer_char_t yych; + unsigned int yyaccept = 0; + static const unsigned char yybm[] = + { + 0, 64, 64, 64, 64, 64, 64, 64, + 64, 96, 96, 64, 64, 96, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, + 96, 64, 0, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 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, + }; + + if ((m_limit - m_cursor) < 5) + { + yyfill(); + }; + yych = *m_cursor; + if (yych <= '9') + { + if (yych <= ' ') + { + if (yych <= '\n') + { + if (yych <= 0x00) + { + goto basic_json_parser_27; + } + if (yych <= 0x08) + { + goto basic_json_parser_29; + } + if (yych >= '\n') + { + goto basic_json_parser_4; + } + } + else + { + if (yych == '\r') + { + goto basic_json_parser_2; + } + if (yych <= 0x1F) + { + goto basic_json_parser_29; + } + } + } + else + { + if (yych <= ',') + { + if (yych == '"') + { + goto basic_json_parser_26; + } + if (yych <= '+') + { + goto basic_json_parser_29; + } + goto basic_json_parser_14; + } + else + { + if (yych <= '-') + { + goto basic_json_parser_22; + } + if (yych <= '/') + { + goto basic_json_parser_29; + } + if (yych <= '0') + { + goto basic_json_parser_23; + } + goto basic_json_parser_25; + } + } } - } else { - if (yych <= ',') { - if (yych == '"') goto basic_json_parser_26; - if (yych <= '+') goto basic_json_parser_29; - goto basic_json_parser_14; - } else { - if (yych <= '-') goto basic_json_parser_22; - if (yych <= '/') goto basic_json_parser_29; - if (yych <= '0') goto basic_json_parser_23; - goto basic_json_parser_25; + else + { + if (yych <= 'm') + { + if (yych <= '\\') + { + if (yych <= ':') + { + goto basic_json_parser_16; + } + if (yych == '[') + { + goto basic_json_parser_6; + } + goto basic_json_parser_29; + } + else + { + if (yych <= ']') + { + goto basic_json_parser_8; + } + if (yych == 'f') + { + goto basic_json_parser_21; + } + goto basic_json_parser_29; + } + } + else + { + if (yych <= 'z') + { + if (yych <= 'n') + { + goto basic_json_parser_18; + } + if (yych == 't') + { + goto basic_json_parser_20; + } + goto basic_json_parser_29; + } + else + { + if (yych <= '{') + { + goto basic_json_parser_10; + } + if (yych == '}') + { + goto basic_json_parser_12; + } + goto basic_json_parser_29; + } + } } - } - } else { - if (yych <= 'm') { - if (yych <= '\\') { - if (yych <= ':') goto basic_json_parser_16; - if (yych == '[') goto basic_json_parser_6; - goto basic_json_parser_29; - } else { - if (yych <= ']') goto basic_json_parser_8; - if (yych == 'f') goto basic_json_parser_21; - goto basic_json_parser_29; - } - } else { - if (yych <= 'z') { - if (yych <= 'n') goto basic_json_parser_18; - if (yych == 't') goto basic_json_parser_20; - goto basic_json_parser_29; - } else { - if (yych <= '{') goto basic_json_parser_10; - if (yych == '}') goto basic_json_parser_12; - goto basic_json_parser_29; - } - } - } basic_json_parser_2: - ++m_cursor; - yych = *m_cursor; - goto basic_json_parser_5; + ++m_cursor; + yych = *m_cursor; + goto basic_json_parser_5; basic_json_parser_3: - { return scan(); } + { + return scan(); + } basic_json_parser_4: - ++m_cursor; - if (m_limit <= m_cursor) { yyfill(); }; - yych = *m_cursor; + ++m_cursor; + if (m_limit <= m_cursor) + { + yyfill(); + }; + yych = *m_cursor; basic_json_parser_5: - if (yybm[0+yych] & 32) { - goto basic_json_parser_4; - } - goto basic_json_parser_3; + if (yybm[0 + yych] & 32) + { + goto basic_json_parser_4; + } + goto basic_json_parser_3; basic_json_parser_6: - ++m_cursor; - { return token_type::begin_array; } + ++m_cursor; + { + return token_type::begin_array; + } basic_json_parser_8: - ++m_cursor; - { return token_type::end_array; } + ++m_cursor; + { + return token_type::end_array; + } basic_json_parser_10: - ++m_cursor; - { return token_type::begin_object; } + ++m_cursor; + { + return token_type::begin_object; + } basic_json_parser_12: - ++m_cursor; - { return token_type::end_object; } + ++m_cursor; + { + return token_type::end_object; + } basic_json_parser_14: - ++m_cursor; - { return token_type::value_separator; } + ++m_cursor; + { + return token_type::value_separator; + } basic_json_parser_16: - ++m_cursor; - { return token_type::name_separator; } + ++m_cursor; + { + return token_type::name_separator; + } basic_json_parser_18: - yyaccept = 0; - yych = *(m_marker = ++m_cursor); - if (yych == 'u') goto basic_json_parser_59; + yyaccept = 0; + yych = *(m_marker = ++m_cursor); + if (yych == 'u') + { + goto basic_json_parser_59; + } basic_json_parser_19: - { return token_type::parse_error; } + { + return token_type::parse_error; + } basic_json_parser_20: - yyaccept = 0; - yych = *(m_marker = ++m_cursor); - if (yych == 'r') goto basic_json_parser_55; - goto basic_json_parser_19; + yyaccept = 0; + yych = *(m_marker = ++m_cursor); + if (yych == 'r') + { + goto basic_json_parser_55; + } + goto basic_json_parser_19; basic_json_parser_21: - yyaccept = 0; - yych = *(m_marker = ++m_cursor); - if (yych == 'a') goto basic_json_parser_50; - goto basic_json_parser_19; + yyaccept = 0; + yych = *(m_marker = ++m_cursor); + if (yych == 'a') + { + goto basic_json_parser_50; + } + goto basic_json_parser_19; basic_json_parser_22: - yych = *++m_cursor; - if (yych <= '/') goto basic_json_parser_19; - if (yych <= '0') goto basic_json_parser_49; - if (yych <= '9') goto basic_json_parser_40; - goto basic_json_parser_19; + yych = *++m_cursor; + if (yych <= '/') + { + goto basic_json_parser_19; + } + if (yych <= '0') + { + goto basic_json_parser_49; + } + if (yych <= '9') + { + goto basic_json_parser_40; + } + goto basic_json_parser_19; basic_json_parser_23: - yyaccept = 1; - yych = *(m_marker = ++m_cursor); - if (yych <= 'D') { - if (yych == '.') goto basic_json_parser_42; - } else { - if (yych <= 'E') goto basic_json_parser_43; - if (yych == 'e') goto basic_json_parser_43; - } + yyaccept = 1; + yych = *(m_marker = ++m_cursor); + if (yych <= 'D') + { + if (yych == '.') + { + goto basic_json_parser_42; + } + } + else + { + if (yych <= 'E') + { + goto basic_json_parser_43; + } + if (yych == 'e') + { + goto basic_json_parser_43; + } + } basic_json_parser_24: - { return token_type::value_number; } + { + return token_type::value_number; + } basic_json_parser_25: - yyaccept = 1; - yych = *(m_marker = ++m_cursor); - goto basic_json_parser_41; + yyaccept = 1; + yych = *(m_marker = ++m_cursor); + goto basic_json_parser_41; basic_json_parser_26: - yyaccept = 0; - yych = *(m_marker = ++m_cursor); - if (yych <= 0x00) goto basic_json_parser_19; - goto basic_json_parser_31; + yyaccept = 0; + yych = *(m_marker = ++m_cursor); + if (yych <= 0x00) + { + goto basic_json_parser_19; + } + goto basic_json_parser_31; basic_json_parser_27: - ++m_cursor; - { return token_type::end_of_input; } + ++m_cursor; + { + return token_type::end_of_input; + } basic_json_parser_29: - yych = *++m_cursor; - goto basic_json_parser_19; + yych = *++m_cursor; + goto basic_json_parser_19; basic_json_parser_30: - ++m_cursor; - if (m_limit <= m_cursor) { yyfill(); }; - yych = *m_cursor; + ++m_cursor; + if (m_limit <= m_cursor) + { + yyfill(); + }; + yych = *m_cursor; basic_json_parser_31: - if (yybm[0+yych] & 64) { - goto basic_json_parser_30; - } - if (yych <= 0x00) goto basic_json_parser_32; - if (yych <= '"') goto basic_json_parser_34; - goto basic_json_parser_33; -basic_json_parser_32: - m_cursor = m_marker; - if (yyaccept == 0) { - goto basic_json_parser_19; - } else { - goto basic_json_parser_24; - } -basic_json_parser_33: - ++m_cursor; - if (m_limit <= m_cursor) { yyfill(); }; - yych = *m_cursor; - if (yych <= 'e') { - if (yych <= '/') { - if (yych == '"') goto basic_json_parser_30; - if (yych <= '.') goto basic_json_parser_32; - goto basic_json_parser_30; - } else { - if (yych <= '\\') { - if (yych <= '[') goto basic_json_parser_32; + if (yybm[0 + yych] & 64) + { goto basic_json_parser_30; - } else { - if (yych == 'b') goto basic_json_parser_30; + } + if (yych <= 0x00) + { goto basic_json_parser_32; } - } - } else { - if (yych <= 'q') { - if (yych <= 'f') goto basic_json_parser_30; - if (yych == 'n') goto basic_json_parser_30; - goto basic_json_parser_32; - } else { - if (yych <= 's') { - if (yych <= 'r') goto basic_json_parser_30; - goto basic_json_parser_32; - } else { - if (yych <= 't') goto basic_json_parser_30; - if (yych <= 'u') goto basic_json_parser_36; - goto basic_json_parser_32; + if (yych <= '"') + { + goto basic_json_parser_34; + } + goto basic_json_parser_33; +basic_json_parser_32: + m_cursor = m_marker; + if (yyaccept == 0) + { + goto basic_json_parser_19; + } + else + { + goto basic_json_parser_24; + } +basic_json_parser_33: + ++m_cursor; + if (m_limit <= m_cursor) + { + yyfill(); + }; + yych = *m_cursor; + if (yych <= 'e') + { + if (yych <= '/') + { + if (yych == '"') + { + goto basic_json_parser_30; + } + if (yych <= '.') + { + goto basic_json_parser_32; + } + goto basic_json_parser_30; + } + else + { + if (yych <= '\\') + { + if (yych <= '[') + { + goto basic_json_parser_32; + } + goto basic_json_parser_30; + } + else + { + if (yych == 'b') + { + goto basic_json_parser_30; + } + goto basic_json_parser_32; + } + } + } + else + { + if (yych <= 'q') + { + if (yych <= 'f') + { + goto basic_json_parser_30; + } + if (yych == 'n') + { + goto basic_json_parser_30; + } + goto basic_json_parser_32; + } + else + { + if (yych <= 's') + { + if (yych <= 'r') + { + goto basic_json_parser_30; + } + goto basic_json_parser_32; + } + else + { + if (yych <= 't') + { + goto basic_json_parser_30; + } + if (yych <= 'u') + { + goto basic_json_parser_36; + } + goto basic_json_parser_32; + } + } } - } - } basic_json_parser_34: - ++m_cursor; - { return token_type::value_string; } + ++m_cursor; + { + return token_type::value_string; + } basic_json_parser_36: - ++m_cursor; - if (m_limit <= m_cursor) { yyfill(); }; - yych = *m_cursor; - if (yych <= '@') { - if (yych <= '/') goto basic_json_parser_32; - if (yych >= ':') goto basic_json_parser_32; - } else { - if (yych <= 'F') goto basic_json_parser_37; - if (yych <= '`') goto basic_json_parser_32; - if (yych >= 'g') goto basic_json_parser_32; - } + ++m_cursor; + if (m_limit <= m_cursor) + { + yyfill(); + }; + yych = *m_cursor; + if (yych <= '@') + { + if (yych <= '/') + { + goto basic_json_parser_32; + } + if (yych >= ':') + { + goto basic_json_parser_32; + } + } + else + { + if (yych <= 'F') + { + goto basic_json_parser_37; + } + if (yych <= '`') + { + goto basic_json_parser_32; + } + if (yych >= 'g') + { + goto basic_json_parser_32; + } + } basic_json_parser_37: - ++m_cursor; - if (m_limit <= m_cursor) { yyfill(); }; - yych = *m_cursor; - if (yych <= '@') { - if (yych <= '/') goto basic_json_parser_32; - if (yych >= ':') goto basic_json_parser_32; - } else { - if (yych <= 'F') goto basic_json_parser_38; - if (yych <= '`') goto basic_json_parser_32; - if (yych >= 'g') goto basic_json_parser_32; - } + ++m_cursor; + if (m_limit <= m_cursor) + { + yyfill(); + }; + yych = *m_cursor; + if (yych <= '@') + { + if (yych <= '/') + { + goto basic_json_parser_32; + } + if (yych >= ':') + { + goto basic_json_parser_32; + } + } + else + { + if (yych <= 'F') + { + goto basic_json_parser_38; + } + if (yych <= '`') + { + goto basic_json_parser_32; + } + if (yych >= 'g') + { + goto basic_json_parser_32; + } + } basic_json_parser_38: - ++m_cursor; - if (m_limit <= m_cursor) { yyfill(); }; - yych = *m_cursor; - if (yych <= '@') { - if (yych <= '/') goto basic_json_parser_32; - if (yych >= ':') goto basic_json_parser_32; - } else { - if (yych <= 'F') goto basic_json_parser_39; - if (yych <= '`') goto basic_json_parser_32; - if (yych >= 'g') goto basic_json_parser_32; - } + ++m_cursor; + if (m_limit <= m_cursor) + { + yyfill(); + }; + yych = *m_cursor; + if (yych <= '@') + { + if (yych <= '/') + { + goto basic_json_parser_32; + } + if (yych >= ':') + { + goto basic_json_parser_32; + } + } + else + { + if (yych <= 'F') + { + goto basic_json_parser_39; + } + if (yych <= '`') + { + goto basic_json_parser_32; + } + if (yych >= 'g') + { + goto basic_json_parser_32; + } + } basic_json_parser_39: - ++m_cursor; - if (m_limit <= m_cursor) { yyfill(); }; - yych = *m_cursor; - if (yych <= '@') { - if (yych <= '/') goto basic_json_parser_32; - if (yych <= '9') goto basic_json_parser_30; - goto basic_json_parser_32; - } else { - if (yych <= 'F') goto basic_json_parser_30; - if (yych <= '`') goto basic_json_parser_32; - if (yych <= 'f') goto basic_json_parser_30; - goto basic_json_parser_32; - } + ++m_cursor; + if (m_limit <= m_cursor) + { + yyfill(); + }; + yych = *m_cursor; + if (yych <= '@') + { + if (yych <= '/') + { + goto basic_json_parser_32; + } + if (yych <= '9') + { + goto basic_json_parser_30; + } + goto basic_json_parser_32; + } + else + { + if (yych <= 'F') + { + goto basic_json_parser_30; + } + if (yych <= '`') + { + goto basic_json_parser_32; + } + if (yych <= 'f') + { + goto basic_json_parser_30; + } + goto basic_json_parser_32; + } basic_json_parser_40: - yyaccept = 1; - m_marker = ++m_cursor; - if ((m_limit - m_cursor) < 3) { yyfill(); }; - yych = *m_cursor; + yyaccept = 1; + m_marker = ++m_cursor; + if ((m_limit - m_cursor) < 3) + { + yyfill(); + }; + yych = *m_cursor; basic_json_parser_41: - if (yybm[0+yych] & 128) { - goto basic_json_parser_40; - } - if (yych <= 'D') { - if (yych != '.') goto basic_json_parser_24; - } else { - if (yych <= 'E') goto basic_json_parser_43; - if (yych == 'e') goto basic_json_parser_43; - goto basic_json_parser_24; - } + if (yybm[0 + yych] & 128) + { + goto basic_json_parser_40; + } + if (yych <= 'D') + { + if (yych != '.') + { + goto basic_json_parser_24; + } + } + else + { + if (yych <= 'E') + { + goto basic_json_parser_43; + } + if (yych == 'e') + { + goto basic_json_parser_43; + } + goto basic_json_parser_24; + } basic_json_parser_42: - yych = *++m_cursor; - if (yych <= '/') goto basic_json_parser_32; - if (yych <= '9') goto basic_json_parser_47; - goto basic_json_parser_32; + yych = *++m_cursor; + if (yych <= '/') + { + goto basic_json_parser_32; + } + if (yych <= '9') + { + goto basic_json_parser_47; + } + goto basic_json_parser_32; basic_json_parser_43: - yych = *++m_cursor; - if (yych <= ',') { - if (yych != '+') goto basic_json_parser_32; - } else { - if (yych <= '-') goto basic_json_parser_44; - if (yych <= '/') goto basic_json_parser_32; - if (yych <= '9') goto basic_json_parser_45; - goto basic_json_parser_32; - } + yych = *++m_cursor; + if (yych <= ',') + { + if (yych != '+') + { + goto basic_json_parser_32; + } + } + else + { + if (yych <= '-') + { + goto basic_json_parser_44; + } + if (yych <= '/') + { + goto basic_json_parser_32; + } + if (yych <= '9') + { + goto basic_json_parser_45; + } + goto basic_json_parser_32; + } basic_json_parser_44: - yych = *++m_cursor; - if (yych <= '/') goto basic_json_parser_32; - if (yych >= ':') goto basic_json_parser_32; + yych = *++m_cursor; + if (yych <= '/') + { + goto basic_json_parser_32; + } + if (yych >= ':') + { + goto basic_json_parser_32; + } basic_json_parser_45: - ++m_cursor; - if (m_limit <= m_cursor) { yyfill(); }; - yych = *m_cursor; - if (yych <= '/') goto basic_json_parser_24; - if (yych <= '9') goto basic_json_parser_45; - goto basic_json_parser_24; + ++m_cursor; + if (m_limit <= m_cursor) + { + yyfill(); + }; + yych = *m_cursor; + if (yych <= '/') + { + goto basic_json_parser_24; + } + if (yych <= '9') + { + goto basic_json_parser_45; + } + goto basic_json_parser_24; basic_json_parser_47: - yyaccept = 1; - m_marker = ++m_cursor; - if ((m_limit - m_cursor) < 3) { yyfill(); }; - yych = *m_cursor; - if (yych <= 'D') { - if (yych <= '/') goto basic_json_parser_24; - if (yych <= '9') goto basic_json_parser_47; - goto basic_json_parser_24; - } else { - if (yych <= 'E') goto basic_json_parser_43; - if (yych == 'e') goto basic_json_parser_43; - goto basic_json_parser_24; - } + yyaccept = 1; + m_marker = ++m_cursor; + if ((m_limit - m_cursor) < 3) + { + yyfill(); + }; + yych = *m_cursor; + if (yych <= 'D') + { + if (yych <= '/') + { + goto basic_json_parser_24; + } + if (yych <= '9') + { + goto basic_json_parser_47; + } + goto basic_json_parser_24; + } + else + { + if (yych <= 'E') + { + goto basic_json_parser_43; + } + if (yych == 'e') + { + goto basic_json_parser_43; + } + goto basic_json_parser_24; + } basic_json_parser_49: - yyaccept = 1; - yych = *(m_marker = ++m_cursor); - if (yych <= 'D') { - if (yych == '.') goto basic_json_parser_42; - goto basic_json_parser_24; - } else { - if (yych <= 'E') goto basic_json_parser_43; - if (yych == 'e') goto basic_json_parser_43; - goto basic_json_parser_24; - } + yyaccept = 1; + yych = *(m_marker = ++m_cursor); + if (yych <= 'D') + { + if (yych == '.') + { + goto basic_json_parser_42; + } + goto basic_json_parser_24; + } + else + { + if (yych <= 'E') + { + goto basic_json_parser_43; + } + if (yych == 'e') + { + goto basic_json_parser_43; + } + goto basic_json_parser_24; + } basic_json_parser_50: - yych = *++m_cursor; - if (yych != 'l') goto basic_json_parser_32; - yych = *++m_cursor; - if (yych != 's') goto basic_json_parser_32; - yych = *++m_cursor; - if (yych != 'e') goto basic_json_parser_32; - ++m_cursor; - { return token_type::literal_false; } + yych = *++m_cursor; + if (yych != 'l') + { + goto basic_json_parser_32; + } + yych = *++m_cursor; + if (yych != 's') + { + goto basic_json_parser_32; + } + yych = *++m_cursor; + if (yych != 'e') + { + goto basic_json_parser_32; + } + ++m_cursor; + { + return token_type::literal_false; + } basic_json_parser_55: - yych = *++m_cursor; - if (yych != 'u') goto basic_json_parser_32; - yych = *++m_cursor; - if (yych != 'e') goto basic_json_parser_32; - ++m_cursor; - { return token_type::literal_true; } + yych = *++m_cursor; + if (yych != 'u') + { + goto basic_json_parser_32; + } + yych = *++m_cursor; + if (yych != 'e') + { + goto basic_json_parser_32; + } + ++m_cursor; + { + return token_type::literal_true; + } basic_json_parser_59: - yych = *++m_cursor; - if (yych != 'l') goto basic_json_parser_32; - yych = *++m_cursor; - if (yych != 'l') goto basic_json_parser_32; - ++m_cursor; - { return token_type::literal_null; } - } + yych = *++m_cursor; + if (yych != 'l') + { + goto basic_json_parser_32; + } + yych = *++m_cursor; + if (yych != 'l') + { + goto basic_json_parser_32; + } + ++m_cursor; + { + return token_type::literal_null; + } + } } diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c index df9bf239..a88facf7 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -58,16 +58,15 @@ namespace nlohmann // Helper to determine whether there's a key_type for T. // http://stackoverflow.com/a/7728728/266378 template -struct has_key_type +struct has_mapped_type { private: - template static char test(typename C::key_type*); + template static char test(typename C::mapped_type*); template static int test(...); public: enum { value = sizeof(test(0)) == sizeof(char) }; }; - /*! @brief JSON @@ -814,7 +813,7 @@ class basic_json return m_type; } - + private: ////////////////////// // value conversion // ////////////////////// @@ -822,89 +821,206 @@ class basic_json /// get an object (explicit) template ::value and - std::is_constructible::value, int>::type - = 0> - inline T get() const + std::is_convertible::value and + std::is_convertible::value + , int>::type = 0> + inline T get_impl(T*) const { switch (m_type) { case (value_t::object): + { return T(m_value.object->begin(), m_value.object->end()); + } default: + { throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name()); + } + } + } + + /// get an object (explicit) + inline object_t get_impl(object_t*) const + { + switch (m_type) + { + case (value_t::object): + { + return *(m_value.object); + } + default: + { + throw std::logic_error("cannot cast " + type_name() + " to object"); + } } } /// get an array (explicit) template ::value and - not has_key_type::value and - std::is_constructible::value, int>::type - = 0> - inline T get() const + std::is_convertible::value and + not std::is_same::value and + not std::is_arithmetic::value and + not std::is_convertible::value and + not has_mapped_type::value + , int>::type = 0> + inline T get_impl(T*) const { switch (m_type) { case (value_t::array): - return T(m_value.array->begin(), m_value.array->end()); + { + T to_vector; + //to_vector.reserve(m_value.array->size()); + std::transform(m_value.array->begin(), m_value.array->end(), + std::inserter(to_vector, to_vector.end()), [](basic_json i) + { + return i.get(); + }); + return to_vector; + + // return T(m_value.array->begin(), m_value.array->end()); + } default: + { throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name()); + } + } + } + + /// get an array (explicit) + template ::value and + not std::is_same::value + , int>::type = 0> + inline std::vector get_impl(std::vector*) const + { + switch (m_type) + { + case (value_t::array): + { + std::vector to_vector; + to_vector.reserve(m_value.array->size()); + std::transform(m_value.array->begin(), m_value.array->end(), + std::inserter(to_vector, to_vector.end()), [](basic_json i) + { + return i.get(); + }); + return to_vector; + } + default: + { + throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name()); + } + } + } + + /// get an array (explicit) + template ::value and + not has_mapped_type::value + , int>::type = 0> + inline T get_impl(T*) const + { + switch (m_type) + { + case (value_t::array): + { + return T(m_value.array->begin(), m_value.array->end()); + } + default: + { + throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name()); + } + } + } + + inline array_t get_impl(array_t*) const + { + switch (m_type) + { + case (value_t::array): + { + return *(m_value.array); + } + default: + { + throw std::logic_error("cannot cast " + type_name() + " to array"); + } } } /// get a string (explicit) template ::value, int>::type - = 0> - inline T get() const + std::is_convertible::value + , int>::type = 0> + inline T get_impl(T*) const { switch (m_type) { case (value_t::string): + { return *m_value.string; + } default: + { throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name()); - } - } - - /// get a boolean (explicit) - template ::value, int>::type - = 0> - inline T get() const - { - switch (m_type) - { - case (value_t::boolean): - return m_value.boolean; - default: - throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name()); + } } } /// get a number (explicit) template::value and - std::is_arithmetic::value, int>::type - = 0> - inline T get() const + std::is_arithmetic::value + , int>::type = 0> + inline T get_impl(T*) const { switch (m_type) { case (value_t::number_integer): + { return static_cast(m_value.number_integer); + } case (value_t::number_float): + { return static_cast(m_value.number_float); + } default: + { throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name()); + } } } + /// get a boolean (explicit) + inline boolean_t get_impl(boolean_t*) const + { + switch (m_type) + { + case (value_t::boolean): + { + return m_value.boolean; + } + default: + { + throw std::logic_error("cannot cast " + type_name() + " to " + typeid(boolean_t).name()); + } + } + } + + public: + /// get a value (explicit) + // + template + inline T get() const + { + return get_impl(static_cast(nullptr)); + } + /// get a value (implicit) template inline operator T() const @@ -1077,7 +1193,7 @@ class basic_json // at only works for objects if (m_type != value_t::object) { - throw std::runtime_error("cannot use at with " + type_name()); + throw std::runtime_error("cannot use erase with " + type_name()); } return m_value.object->erase(key); diff --git a/test/unit.cpp b/test/unit.cpp index bc9edc24..cd79db69 100644 --- a/test/unit.cpp +++ b/test/unit.cpp @@ -2006,6 +2006,108 @@ TEST_CASE("value conversion") CHECK(json(n).m_value.number_float == Approx(j.m_value.number_float)); } } + + SECTION("more involved conversions") + { + SECTION("object-like STL containers") + { + json j1 = {{"one", 1}, {"two", 2}, {"three", 3}}; + json j2 = {{"one", 1.1}, {"two", 2.2}, {"three", 3.3}}; + json j3 = {{"one", true}, {"two", false}, {"three", true}}; + json j4 = {{"one", "eins"}, {"two", "zwei"}, {"three", "drei"}}; + + SECTION("std::map") + { + auto m1 = j1.get>(); + auto m2 = j2.get>(); + auto m3 = j3.get>(); + //auto m4 = j4.get>(); + } + + SECTION("std::unordered_map") + { + auto m1 = j1.get>(); + auto m2 = j2.get>(); + auto m3 = j3.get>(); + //auto m4 = j4.get>(); + //CHECK(m4["one"] == "eins"); + } + + SECTION("std::multimap") + { + auto m1 = j1.get>(); + auto m2 = j2.get>(); + auto m3 = j3.get>(); + //auto m4 = j4.get>(); + //CHECK(m4["one"] == "eins"); + } + + SECTION("std::unordered_multimap") + { + auto m1 = j1.get>(); + auto m2 = j2.get>(); + auto m3 = j3.get>(); + //auto m4 = j4.get>(); + //CHECK(m4["one"] == "eins"); + } + } + + SECTION("array-like STL containers") + { + json j1 = {1, 2, 3, 4}; + json j2 = {1.2, 2.3, 3.4, 4.5}; + json j3 = {true, false, true}; + json j4 = {"one", "two", "three"}; + + SECTION("std::list") + { + auto m1 = j1.get>(); + auto m2 = j2.get>(); + auto m3 = j3.get>(); + auto m4 = j4.get>(); + } + + //SECTION("std::forward_list") + //{ + // auto m1 = j1.get>(); + // auto m2 = j2.get>(); + // auto m3 = j3.get>(); + // auto m4 = j4.get>(); + //} + + SECTION("std::vector") + { + auto m1 = j1.get>(); + auto m2 = j2.get>(); + auto m3 = j3.get>(); + auto m4 = j4.get>(); + } + + SECTION("std::deque") + { + auto m1 = j1.get>(); + auto m2 = j2.get>(); + auto m3 = j3.get>(); + auto m4 = j4.get>(); + } + + SECTION("std::set") + { + auto m1 = j1.get>(); + auto m2 = j2.get>(); + auto m3 = j3.get>(); + auto m4 = j4.get>(); + } + + SECTION("std::unordered_set") + { + auto m1 = j1.get>(); + auto m2 = j2.get>(); + auto m3 = j3.get>(); + auto m4 = j4.get>(); + } + } + } } TEST_CASE("element access")