Skip to content

J
json
Unverified Commit dbebf8de by Théo DELRIEU
Options

add to_json method for C arrays

If the array can be converted to basic_json::string_t, the overload in this commit is not chosen.
parent 100bf3ef
Showing with 245 additions and 765 deletions
src/json.hpp
...@@ -800,6 +800,13 @@ void to_json(BasicJsonType& j, const CompatibleObjectType& arr) ...@@ -800,6 +800,13 @@ void to_json(BasicJsonType& j, const CompatibleObjectType& arr)
external_constructor<value_t::object>::construct(j, arr); external_constructor<value_t::object>::construct(j, arr);
} }
template <typename BasicJsonType, typename T, std::size_t N,
enable_if_t<not std::is_constructible<
typename BasicJsonType::string_t, T (&)[N]>::value,
int> = 0>
void to_json(BasicJsonType &j, T (&arr)[N]) {
external_constructor<value_t::array>::construct(j, arr);
}
/////////////// ///////////////
// from_json // // from_json //
...@@ -10330,8 +10337,7 @@ class basic_json ...@@ -10330,8 +10337,7 @@ class basic_json
{ {
lexer_char_t yych; lexer_char_t yych;
unsigned int yyaccept = 0; unsigned int yyaccept = 0;
static const unsigned char yybm[] = static const unsigned char yybm[] = {
{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 32, 32, 0, 0, 32, 0, 0, 0, 32, 32, 0, 0, 32, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
...@@ -10365,996 +10371,449 @@ class basic_json ...@@ -10365,996 +10371,449 @@ class basic_json
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
}; };
if ((m_limit - m_cursor) < 5) if ((m_limit - m_cursor) < 5) fill_line_buffer(5); // LCOV_EXCL_LINE
{
fill_line_buffer(5); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yybm[0 + yych] & 32) if (yybm[0+yych] & 32) {
{
goto basic_json_parser_6; goto basic_json_parser_6;
} }
if (yych <= '[') if (yych <= '[') {
{ if (yych <= '-') {
if (yych <= '-') if (yych <= '"') {
{ if (yych <= 0x00) goto basic_json_parser_2;
if (yych <= '"') if (yych <= '!') goto basic_json_parser_4;
{
if (yych <= 0x00)
{
goto basic_json_parser_2;
}
if (yych <= '!')
{
goto basic_json_parser_4;
}
goto basic_json_parser_9; goto basic_json_parser_9;
} } else {
else if (yych <= '+') goto basic_json_parser_4;
{ if (yych <= ',') goto basic_json_parser_10;
if (yych <= '+')
{
goto basic_json_parser_4;
}
if (yych <= ',')
{
goto basic_json_parser_10;
}
goto basic_json_parser_12; goto basic_json_parser_12;
} }
} } else {
else if (yych <= '9') {
{ if (yych <= '/') goto basic_json_parser_4;
if (yych <= '9') if (yych <= '0') goto basic_json_parser_13;
{
if (yych <= '/')
{
goto basic_json_parser_4;
}
if (yych <= '0')
{
goto basic_json_parser_13;
}
goto basic_json_parser_15; goto basic_json_parser_15;
} } else {
else if (yych <= ':') goto basic_json_parser_17;
{ if (yych <= 'Z') goto basic_json_parser_4;
if (yych <= ':')
{
goto basic_json_parser_17;
}
if (yych <= 'Z')
{
goto basic_json_parser_4;
}
goto basic_json_parser_19; goto basic_json_parser_19;
} }
} }
} } else {
else if (yych <= 'n') {
{ if (yych <= 'e') {
if (yych <= 'n') if (yych == ']') goto basic_json_parser_21;
{
if (yych <= 'e')
{
if (yych == ']')
{
goto basic_json_parser_21;
}
goto basic_json_parser_4;
}
else
{
if (yych <= 'f')
{
goto basic_json_parser_23;
}
if (yych <= 'm')
{
goto basic_json_parser_4; goto basic_json_parser_4;
} } else {
if (yych <= 'f') goto basic_json_parser_23;
if (yych <= 'm') goto basic_json_parser_4;
goto basic_json_parser_24; goto basic_json_parser_24;
} }
} } else {
else if (yych <= 'z') {
{ if (yych == 't') goto basic_json_parser_25;
if (yych <= 'z')
{
if (yych == 't')
{
goto basic_json_parser_25;
}
goto basic_json_parser_4; goto basic_json_parser_4;
} } else {
else if (yych <= '{') goto basic_json_parser_26;
{ if (yych == '}') goto basic_json_parser_28;
if (yych <= '{')
{
goto basic_json_parser_26;
}
if (yych == '}')
{
goto basic_json_parser_28;
}
goto basic_json_parser_4; goto basic_json_parser_4;
} }
} }
} }
basic_json_parser_2: basic_json_parser_2:
++m_cursor; ++m_cursor;
{ { last_token_type = token_type::end_of_input; break; }
last_token_type = token_type::end_of_input;
break;
}
basic_json_parser_4: basic_json_parser_4:
++m_cursor; ++m_cursor;
basic_json_parser_5: basic_json_parser_5:
{ { last_token_type = token_type::parse_error; break; }
last_token_type = token_type::parse_error;
break;
}
basic_json_parser_6: basic_json_parser_6:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yybm[0 + yych] & 32) if (yybm[0+yych] & 32) {
{
goto basic_json_parser_6; goto basic_json_parser_6;
} }
{ { position += static_cast<size_t>((m_cursor - m_start)); continue; }
position += static_cast<size_t>((m_cursor - m_start));
continue;
}
basic_json_parser_9: basic_json_parser_9:
yyaccept = 0; yyaccept = 0;
yych = *(m_marker = ++m_cursor); yych = *(m_marker = ++m_cursor);
if (yych <= 0x1F) if (yych <= 0x1F) goto basic_json_parser_5;
{ if (yych <= 0x7F) goto basic_json_parser_31;
goto basic_json_parser_5; if (yych <= 0xC1) goto basic_json_parser_5;
} if (yych <= 0xF4) goto basic_json_parser_31;
if (yych <= 0x7F)
{
goto basic_json_parser_31;
}
if (yych <= 0xC1)
{
goto basic_json_parser_5;
}
if (yych <= 0xF4)
{
goto basic_json_parser_31;
}
goto basic_json_parser_5; goto basic_json_parser_5;
basic_json_parser_10: basic_json_parser_10:
++m_cursor; ++m_cursor;
{ { last_token_type = token_type::value_separator; break; }
last_token_type = token_type::value_separator;
break;
}
basic_json_parser_12: basic_json_parser_12:
yych = *++m_cursor; yych = *++m_cursor;
if (yych <= '/') if (yych <= '/') goto basic_json_parser_5;
{ if (yych <= '0') goto basic_json_parser_43;
goto basic_json_parser_5; if (yych <= '9') goto basic_json_parser_45;
}
if (yych <= '0')
{
goto basic_json_parser_43;
}
if (yych <= '9')
{
goto basic_json_parser_45;
}
goto basic_json_parser_5; goto basic_json_parser_5;
basic_json_parser_13: basic_json_parser_13:
yyaccept = 1; yyaccept = 1;
yych = *(m_marker = ++m_cursor); yych = *(m_marker = ++m_cursor);
if (yych <= '9') if (yych <= '9') {
{ if (yych == '.') goto basic_json_parser_47;
if (yych == '.') if (yych >= '0') goto basic_json_parser_48;
{ } else {
goto basic_json_parser_47; if (yych <= 'E') {
} if (yych >= 'E') goto basic_json_parser_51;
if (yych >= '0') } else {
{ if (yych == 'e') goto basic_json_parser_51;
goto basic_json_parser_48;
}
}
else
{
if (yych <= 'E')
{
if (yych >= 'E')
{
goto basic_json_parser_51;
}
}
else
{
if (yych == 'e')
{
goto basic_json_parser_51;
}
} }
} }
basic_json_parser_14: basic_json_parser_14:
{ { last_token_type = token_type::value_unsigned; break; }
last_token_type = token_type::value_unsigned;
break;
}
basic_json_parser_15: basic_json_parser_15:
yyaccept = 1; yyaccept = 1;
m_marker = ++m_cursor; m_marker = ++m_cursor;
if ((m_limit - m_cursor) < 3) if ((m_limit - m_cursor) < 3) fill_line_buffer(3); // LCOV_EXCL_LINE
{
fill_line_buffer(3); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yybm[0 + yych] & 64) if (yybm[0+yych] & 64) {
{
goto basic_json_parser_15; goto basic_json_parser_15;
} }
if (yych <= 'D') if (yych <= 'D') {
{ if (yych == '.') goto basic_json_parser_47;
if (yych == '.')
{
goto basic_json_parser_47;
}
goto basic_json_parser_14; goto basic_json_parser_14;
} } else {
else if (yych <= 'E') goto basic_json_parser_51;
{ if (yych == 'e') goto basic_json_parser_51;
if (yych <= 'E')
{
goto basic_json_parser_51;
}
if (yych == 'e')
{
goto basic_json_parser_51;
}
goto basic_json_parser_14; goto basic_json_parser_14;
} }
basic_json_parser_17: basic_json_parser_17:
++m_cursor; ++m_cursor;
{ { last_token_type = token_type::name_separator; break; }
last_token_type = token_type::name_separator;
break;
}
basic_json_parser_19: basic_json_parser_19:
++m_cursor; ++m_cursor;
{ { last_token_type = token_type::begin_array; break; }
last_token_type = token_type::begin_array;
break;
}
basic_json_parser_21: basic_json_parser_21:
++m_cursor; ++m_cursor;
{ { last_token_type = token_type::end_array; break; }
last_token_type = token_type::end_array;
break;
}
basic_json_parser_23: basic_json_parser_23:
yyaccept = 0; yyaccept = 0;
yych = *(m_marker = ++m_cursor); yych = *(m_marker = ++m_cursor);
if (yych == 'a') if (yych == 'a') goto basic_json_parser_52;
{
goto basic_json_parser_52;
}
goto basic_json_parser_5; goto basic_json_parser_5;
basic_json_parser_24: basic_json_parser_24:
yyaccept = 0; yyaccept = 0;
yych = *(m_marker = ++m_cursor); yych = *(m_marker = ++m_cursor);
if (yych == 'u') if (yych == 'u') goto basic_json_parser_53;
{
goto basic_json_parser_53;
}
goto basic_json_parser_5; goto basic_json_parser_5;
basic_json_parser_25: basic_json_parser_25:
yyaccept = 0; yyaccept = 0;
yych = *(m_marker = ++m_cursor); yych = *(m_marker = ++m_cursor);
if (yych == 'r') if (yych == 'r') goto basic_json_parser_54;
{
goto basic_json_parser_54;
}
goto basic_json_parser_5; goto basic_json_parser_5;
basic_json_parser_26: basic_json_parser_26:
++m_cursor; ++m_cursor;
{ { last_token_type = token_type::begin_object; break; }
last_token_type = token_type::begin_object;
break;
}
basic_json_parser_28: basic_json_parser_28:
++m_cursor; ++m_cursor;
{ { last_token_type = token_type::end_object; break; }
last_token_type = token_type::end_object;
break;
}
basic_json_parser_30: basic_json_parser_30:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
basic_json_parser_31: basic_json_parser_31:
if (yybm[0 + yych] & 128) if (yybm[0+yych] & 128) {
{
goto basic_json_parser_30; goto basic_json_parser_30;
} }
if (yych <= 0xE0) if (yych <= 0xE0) {
{ if (yych <= '\\') {
if (yych <= '\\') if (yych <= 0x1F) goto basic_json_parser_32;
{ if (yych <= '"') goto basic_json_parser_33;
if (yych <= 0x1F)
{
goto basic_json_parser_32;
}
if (yych <= '"')
{
goto basic_json_parser_33;
}
goto basic_json_parser_35; goto basic_json_parser_35;
} } else {
else if (yych <= 0xC1) goto basic_json_parser_32;
{ if (yych <= 0xDF) goto basic_json_parser_36;
if (yych <= 0xC1)
{
goto basic_json_parser_32;
}
if (yych <= 0xDF)
{
goto basic_json_parser_36;
}
goto basic_json_parser_37; goto basic_json_parser_37;
} }
} } else {
else if (yych <= 0xEF) {
{ if (yych == 0xED) goto basic_json_parser_39;
if (yych <= 0xEF)
{
if (yych == 0xED)
{
goto basic_json_parser_39;
}
goto basic_json_parser_38; goto basic_json_parser_38;
} } else {
else if (yych <= 0xF0) goto basic_json_parser_40;
{ if (yych <= 0xF3) goto basic_json_parser_41;
if (yych <= 0xF0) if (yych <= 0xF4) goto basic_json_parser_42;
{
goto basic_json_parser_40;
}
if (yych <= 0xF3)
{
goto basic_json_parser_41;
}
if (yych <= 0xF4)
{
goto basic_json_parser_42;
}
} }
} }
basic_json_parser_32: basic_json_parser_32:
m_cursor = m_marker; m_cursor = m_marker;
if (yyaccept <= 1) if (yyaccept <= 1) {
{ if (yyaccept == 0) {
if (yyaccept == 0)
{
goto basic_json_parser_5; goto basic_json_parser_5;
} } else {
else
{
goto basic_json_parser_14; goto basic_json_parser_14;
} }
} } else {
else if (yyaccept == 2) {
{
if (yyaccept == 2)
{
goto basic_json_parser_44; goto basic_json_parser_44;
} } else {
else
{
goto basic_json_parser_58; goto basic_json_parser_58;
} }
} }
basic_json_parser_33: basic_json_parser_33:
++m_cursor; ++m_cursor;
{ { last_token_type = token_type::value_string; break; }
last_token_type = token_type::value_string;
break;
}
basic_json_parser_35: basic_json_parser_35:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= 'e') if (yych <= 'e') {
{ if (yych <= '/') {
if (yych <= '/') if (yych == '"') goto basic_json_parser_30;
{ if (yych <= '.') goto basic_json_parser_32;
if (yych == '"')
{
goto basic_json_parser_30; goto basic_json_parser_30;
} } else {
if (yych <= '.') if (yych <= '\\') {
{ if (yych <= '[') goto basic_json_parser_32;
goto basic_json_parser_32;
}
goto basic_json_parser_30; goto basic_json_parser_30;
} } else {
else if (yych == 'b') goto basic_json_parser_30;
{
if (yych <= '\\')
{
if (yych <= '[')
{
goto basic_json_parser_32; goto basic_json_parser_32;
} }
goto basic_json_parser_30;
}
else
{
if (yych == 'b')
{
goto basic_json_parser_30;
} }
} 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; goto basic_json_parser_32;
} } else {
} if (yych <= 's') {
} if (yych <= 'r') goto basic_json_parser_30;
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; goto basic_json_parser_32;
} } else {
else if (yych <= 't') goto basic_json_parser_30;
{ if (yych <= 'u') goto basic_json_parser_55;
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_55;
}
goto basic_json_parser_32; goto basic_json_parser_32;
} }
} }
} }
basic_json_parser_36: basic_json_parser_36:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= 0x7F) if (yych <= 0x7F) goto basic_json_parser_32;
{ if (yych <= 0xBF) goto basic_json_parser_30;
goto basic_json_parser_32;
}
if (yych <= 0xBF)
{
goto basic_json_parser_30;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_37: basic_json_parser_37:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= 0x9F) if (yych <= 0x9F) goto basic_json_parser_32;
{ if (yych <= 0xBF) goto basic_json_parser_36;
goto basic_json_parser_32;
}
if (yych <= 0xBF)
{
goto basic_json_parser_36;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_38: basic_json_parser_38:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= 0x7F) if (yych <= 0x7F) goto basic_json_parser_32;
{ if (yych <= 0xBF) goto basic_json_parser_36;
goto basic_json_parser_32;
}
if (yych <= 0xBF)
{
goto basic_json_parser_36;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_39: basic_json_parser_39:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= 0x7F) if (yych <= 0x7F) goto basic_json_parser_32;
{ if (yych <= 0x9F) goto basic_json_parser_36;
goto basic_json_parser_32;
}
if (yych <= 0x9F)
{
goto basic_json_parser_36;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_40: basic_json_parser_40:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= 0x8F) if (yych <= 0x8F) goto basic_json_parser_32;
{ if (yych <= 0xBF) goto basic_json_parser_38;
goto basic_json_parser_32;
}
if (yych <= 0xBF)
{
goto basic_json_parser_38;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_41: basic_json_parser_41:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= 0x7F) if (yych <= 0x7F) goto basic_json_parser_32;
{ if (yych <= 0xBF) goto basic_json_parser_38;
goto basic_json_parser_32;
}
if (yych <= 0xBF)
{
goto basic_json_parser_38;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_42: basic_json_parser_42:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= 0x7F) if (yych <= 0x7F) goto basic_json_parser_32;
{ if (yych <= 0x8F) goto basic_json_parser_38;
goto basic_json_parser_32;
}
if (yych <= 0x8F)
{
goto basic_json_parser_38;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_43: basic_json_parser_43:
yyaccept = 2; yyaccept = 2;
yych = *(m_marker = ++m_cursor); yych = *(m_marker = ++m_cursor);
if (yych <= '9') if (yych <= '9') {
{ if (yych == '.') goto basic_json_parser_47;
if (yych == '.') if (yych >= '0') goto basic_json_parser_48;
{ } else {
goto basic_json_parser_47; if (yych <= 'E') {
} if (yych >= 'E') goto basic_json_parser_51;
if (yych >= '0') } else {
{ if (yych == 'e') goto basic_json_parser_51;
goto basic_json_parser_48;
}
}
else
{
if (yych <= 'E')
{
if (yych >= 'E')
{
goto basic_json_parser_51;
}
}
else
{
if (yych == 'e')
{
goto basic_json_parser_51;
}
} }
} }
basic_json_parser_44: basic_json_parser_44:
{ { last_token_type = token_type::value_integer; break; }
last_token_type = token_type::value_integer;
break;
}
basic_json_parser_45: basic_json_parser_45:
yyaccept = 2; yyaccept = 2;
m_marker = ++m_cursor; m_marker = ++m_cursor;
if ((m_limit - m_cursor) < 3) if ((m_limit - m_cursor) < 3) fill_line_buffer(3); // LCOV_EXCL_LINE
{
fill_line_buffer(3); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= '9') if (yych <= '9') {
{ if (yych == '.') goto basic_json_parser_47;
if (yych == '.') if (yych <= '/') goto basic_json_parser_44;
{
goto basic_json_parser_47;
}
if (yych <= '/')
{
goto basic_json_parser_44;
}
goto basic_json_parser_45; goto basic_json_parser_45;
} } else {
else if (yych <= 'E') {
{ if (yych <= 'D') goto basic_json_parser_44;
if (yych <= 'E')
{
if (yych <= 'D')
{
goto basic_json_parser_44;
}
goto basic_json_parser_51;
}
else
{
if (yych == 'e')
{
goto basic_json_parser_51; goto basic_json_parser_51;
} } else {
if (yych == 'e') goto basic_json_parser_51;
goto basic_json_parser_44; goto basic_json_parser_44;
} }
} }
basic_json_parser_47: basic_json_parser_47:
yych = *++m_cursor; yych = *++m_cursor;
if (yych <= '/') if (yych <= '/') goto basic_json_parser_32;
{ if (yych <= '9') goto basic_json_parser_56;
goto basic_json_parser_32;
}
if (yych <= '9')
{
goto basic_json_parser_56;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_48: basic_json_parser_48:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= '/') if (yych <= '/') goto basic_json_parser_50;
{ if (yych <= '9') goto basic_json_parser_48;
goto basic_json_parser_50;
}
if (yych <= '9')
{
goto basic_json_parser_48;
}
basic_json_parser_50: basic_json_parser_50:
{ { last_token_type = token_type::parse_error; break; }
last_token_type = token_type::parse_error;
break;
}
basic_json_parser_51: basic_json_parser_51:
yych = *++m_cursor; yych = *++m_cursor;
if (yych <= ',') if (yych <= ',') {
{ if (yych == '+') goto basic_json_parser_59;
if (yych == '+')
{
goto basic_json_parser_59;
}
goto basic_json_parser_32; goto basic_json_parser_32;
} } else {
else if (yych <= '-') goto basic_json_parser_59;
{ if (yych <= '/') goto basic_json_parser_32;
if (yych <= '-') if (yych <= '9') goto basic_json_parser_60;
{
goto basic_json_parser_59;
}
if (yych <= '/')
{
goto basic_json_parser_32;
}
if (yych <= '9')
{
goto basic_json_parser_60;
}
goto basic_json_parser_32; goto basic_json_parser_32;
} }
basic_json_parser_52: basic_json_parser_52:
yych = *++m_cursor; yych = *++m_cursor;
if (yych == 'l') if (yych == 'l') goto basic_json_parser_62;
{
goto basic_json_parser_62;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_53: basic_json_parser_53:
yych = *++m_cursor; yych = *++m_cursor;
if (yych == 'l') if (yych == 'l') goto basic_json_parser_63;
{
goto basic_json_parser_63;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_54: basic_json_parser_54:
yych = *++m_cursor; yych = *++m_cursor;
if (yych == 'u') if (yych == 'u') goto basic_json_parser_64;
{
goto basic_json_parser_64;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_55: basic_json_parser_55:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= '@') if (yych <= '@') {
{ if (yych <= '/') goto basic_json_parser_32;
if (yych <= '/') if (yych <= '9') goto basic_json_parser_65;
{
goto basic_json_parser_32;
}
if (yych <= '9')
{
goto basic_json_parser_65;
}
goto basic_json_parser_32;
}
else
{
if (yych <= 'F')
{
goto basic_json_parser_65;
}
if (yych <= '`')
{
goto basic_json_parser_32; goto basic_json_parser_32;
} } else {
if (yych <= 'f') if (yych <= 'F') goto basic_json_parser_65;
{ if (yych <= '`') goto basic_json_parser_32;
goto basic_json_parser_65; if (yych <= 'f') goto basic_json_parser_65;
}
goto basic_json_parser_32; goto basic_json_parser_32;
} }
basic_json_parser_56: basic_json_parser_56:
yyaccept = 3; yyaccept = 3;
m_marker = ++m_cursor; m_marker = ++m_cursor;
if ((m_limit - m_cursor) < 3) if ((m_limit - m_cursor) < 3) fill_line_buffer(3); // LCOV_EXCL_LINE
{
fill_line_buffer(3); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= 'D') if (yych <= 'D') {
{ if (yych <= '/') goto basic_json_parser_58;
if (yych <= '/') if (yych <= '9') goto basic_json_parser_56;
{ } else {
goto basic_json_parser_58; if (yych <= 'E') goto basic_json_parser_51;
} if (yych == 'e') goto basic_json_parser_51;
if (yych <= '9')
{
goto basic_json_parser_56;
}
}
else
{
if (yych <= 'E')
{
goto basic_json_parser_51;
}
if (yych == 'e')
{
goto basic_json_parser_51;
}
} }
basic_json_parser_58: basic_json_parser_58:
{ { last_token_type = token_type::value_float; break; }
last_token_type = token_type::value_float;
break;
}
basic_json_parser_59: basic_json_parser_59:
yych = *++m_cursor; yych = *++m_cursor;
if (yych <= '/') if (yych <= '/') goto basic_json_parser_32;
{ if (yych >= ':') goto basic_json_parser_32;
goto basic_json_parser_32;
}
if (yych >= ':')
{
goto basic_json_parser_32;
}
basic_json_parser_60: basic_json_parser_60:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= '/') if (yych <= '/') goto basic_json_parser_58;
{ if (yych <= '9') goto basic_json_parser_60;
goto basic_json_parser_58;
}
if (yych <= '9')
{
goto basic_json_parser_60;
}
goto basic_json_parser_58; goto basic_json_parser_58;
basic_json_parser_62: basic_json_parser_62:
yych = *++m_cursor; yych = *++m_cursor;
if (yych == 's') if (yych == 's') goto basic_json_parser_66;
{
goto basic_json_parser_66;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_63: basic_json_parser_63:
yych = *++m_cursor; yych = *++m_cursor;
if (yych == 'l') if (yych == 'l') goto basic_json_parser_67;
{
goto basic_json_parser_67;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_64: basic_json_parser_64:
yych = *++m_cursor; yych = *++m_cursor;
if (yych == 'e') if (yych == 'e') goto basic_json_parser_69;
{
goto basic_json_parser_69;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_65: basic_json_parser_65:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= '@') if (yych <= '@') {
{ if (yych <= '/') goto basic_json_parser_32;
if (yych <= '/') if (yych <= '9') goto basic_json_parser_71;
{
goto basic_json_parser_32;
}
if (yych <= '9')
{
goto basic_json_parser_71;
}
goto basic_json_parser_32;
}
else
{
if (yych <= 'F')
{
goto basic_json_parser_71;
}
if (yych <= '`')
{
goto basic_json_parser_32; goto basic_json_parser_32;
} } else {
if (yych <= 'f') if (yych <= 'F') goto basic_json_parser_71;
{ if (yych <= '`') goto basic_json_parser_32;
goto basic_json_parser_71; if (yych <= 'f') goto basic_json_parser_71;
}
goto basic_json_parser_32; goto basic_json_parser_32;
} }
basic_json_parser_66: basic_json_parser_66:
yych = *++m_cursor; yych = *++m_cursor;
if (yych == 'e') if (yych == 'e') goto basic_json_parser_72;
{
goto basic_json_parser_72;
}
goto basic_json_parser_32; goto basic_json_parser_32;
basic_json_parser_67: basic_json_parser_67:
++m_cursor; ++m_cursor;
{ { last_token_type = token_type::literal_null; break; }
last_token_type = token_type::literal_null;
break;
}
basic_json_parser_69: basic_json_parser_69:
++m_cursor; ++m_cursor;
{ { last_token_type = token_type::literal_true; break; }
last_token_type = token_type::literal_true;
break;
}
basic_json_parser_71: basic_json_parser_71:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= '@') if (yych <= '@') {
{ if (yych <= '/') goto basic_json_parser_32;
if (yych <= '/') if (yych <= '9') goto basic_json_parser_74;
{
goto basic_json_parser_32; goto basic_json_parser_32;
} } else {
if (yych <= '9') if (yych <= 'F') goto basic_json_parser_74;
{ if (yych <= '`') goto basic_json_parser_32;
goto basic_json_parser_74; if (yych <= 'f') goto basic_json_parser_74;
}
goto basic_json_parser_32;
}
else
{
if (yych <= 'F')
{
goto basic_json_parser_74;
}
if (yych <= '`')
{
goto basic_json_parser_32;
}
if (yych <= 'f')
{
goto basic_json_parser_74;
}
goto basic_json_parser_32; goto basic_json_parser_32;
} }
basic_json_parser_72: basic_json_parser_72:
++m_cursor; ++m_cursor;
{ { last_token_type = token_type::literal_false; break; }
last_token_type = token_type::literal_false;
break;
}
basic_json_parser_74: basic_json_parser_74:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor) if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor; yych = *m_cursor;
if (yych <= '@') if (yych <= '@') {
{ if (yych <= '/') goto basic_json_parser_32;
if (yych <= '/') if (yych <= '9') goto basic_json_parser_30;
{
goto basic_json_parser_32; goto basic_json_parser_32;
} } else {
if (yych <= '9') if (yych <= 'F') goto basic_json_parser_30;
{ if (yych <= '`') goto basic_json_parser_32;
goto basic_json_parser_30; if (yych <= 'f') 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; goto basic_json_parser_32;
} }
} }
......
src/json.hpp.re2c
...@@ -800,6 +800,13 @@ void to_json(BasicJsonType& j, const CompatibleObjectType& arr) ...@@ -800,6 +800,13 @@ void to_json(BasicJsonType& j, const CompatibleObjectType& arr)
external_constructor<value_t::object>::construct(j, arr); external_constructor<value_t::object>::construct(j, arr);
} }
template <typename BasicJsonType, typename T, std::size_t N,
enable_if_t<not std::is_constructible<
typename BasicJsonType::string_t, T (&)[N]>::value,
int> = 0>
void to_json(BasicJsonType &j, T (&arr)[N]) {
external_constructor<value_t::array>::construct(j, arr);
}
/////////////// ///////////////
// from_json // // from_json //
......
test/src/unit-conversions.cpp
...@@ -190,6 +190,20 @@ TEST_CASE("value conversion") ...@@ -190,6 +190,20 @@ TEST_CASE("value conversion")
#endif #endif
} }
SECTION("built-in arrays")
{
const char str[] = "a string";
const int nbs[] = {0, 1, 2};
json j2 = nbs;
json j3 = str;
auto v = j2.get<std::vector<int>>();
auto s = j3.get<std::string>();
CHECK(std::equal(v.begin(), v.end(), std::begin(nbs)));
CHECK(s == str);
}
SECTION("std::deque<json>") SECTION("std::deque<json>")
{ {
std::deque<json> a = j.get<std::deque<json>>(); std::deque<json> a = j.get<std::deque<json>>();
......
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