j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

some reorganization

Browse source
This commit is contained in:
Niels 2015-02-14 17:34:06 +01:00
parent cc4a8319a1
commit 6ef3cb51a4
3 changed files with 687 additions and 668 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1207
src/json.hpp
View file

File diff suppressed because it is too large Load diff

130
src/json.hpp.re2c
View file

@ -2516,68 +2516,73 @@ class basic_json
// pointer for backtracking information // pointer for backtracking information
const char* m_marker = nullptr; const char* m_marker = nullptr;
// remember the begin of the token while (true)
m_start = m_cursor; {
// remember the begin of the token
m_start = m_cursor;
/*!re2c /*!re2c
re2c:define:YYCTYPE = char; re2c:define:YYCTYPE = char;
re2c:define:YYCURSOR = m_cursor; re2c:define:YYCURSOR = m_cursor;
re2c:define:YYLIMIT = m_limit; re2c:define:YYLIMIT = m_limit;
re2c:define:YYMARKER = m_marker; re2c:define:YYMARKER = m_marker;
re2c:indent:string = " "; re2c:indent:string = " ";
re2c:indent:top = 1; re2c:indent:top = 1;
re2c:labelprefix = "json_parser_"; re2c:labelprefix = "basic_json_parser_";
re2c:yyfill:enable = 0; re2c:yyfill:enable = 0;
// whitespace // whitespace
ws = [ \t\n\r]*; ws = [ \t\n\r]+;
ws { return scan(); } ws { continue; }
// structural characters // structural characters
"[" { return token_type::begin_array; } "[" { return token_type::begin_array; }
"]" { return token_type::end_array; } "]" { return token_type::end_array; }
"{" { return token_type::begin_object; } "{" { return token_type::begin_object; }
"}" { return token_type::end_object; } "}" { return token_type::end_object; }
"," { return token_type::value_separator; } "," { return token_type::value_separator; }
":" { return token_type::name_separator; } ":" { return token_type::name_separator; }
// literal names // literal names
"null" { return token_type::literal_null; } "null" { return token_type::literal_null; }
"true" { return token_type::literal_true; } "true" { return token_type::literal_true; }
"false" { return token_type::literal_false; } "false" { return token_type::literal_false; }
// number // number
decimal_point = [.]; decimal_point = [.];
digit = [0-9]; digit = [0-9];
digit_1_9 = [1-9]; digit_1_9 = [1-9];
e = [eE]; e = [eE];
minus = [-]; minus = [-];
plus = [+]; plus = [+];
zero = [0]; zero = [0];
exp = e (minus|plus)? digit+; exp = e (minus|plus)? digit+;
frac = decimal_point digit+; frac = decimal_point digit+;
int = (zero|digit_1_9 digit*); int = (zero|digit_1_9 digit*);
number = minus? int frac? exp?; number = minus? int frac? exp?;
number { return token_type::value_number; } number { return token_type::value_number; }
// string // string
quotation_mark = [\"]; quotation_mark = [\"];
escape = [\\]; escape = [\\];
unescaped = [^\"\\\000]; unescaped = [^\"\\\000];
escaped = escape ([\"\\/bfnrt] | [u][0-9a-fA-F]{4}); single_escaped = [\"\\/bfnrt];
char = unescaped | escaped; unicode_escaped = [u][0-9a-fA-F]{4};
string = quotation_mark char* quotation_mark; escaped = escape (single_escaped | unicode_escaped);
string { return token_type::value_string; } char = unescaped | escaped;
string = quotation_mark char* quotation_mark;
string { return token_type::value_string; }
// end of file // end of file
'\000' { return token_type::end_of_input; } '\000' { return token_type::end_of_input; }
// anything else is an error // anything else is an error
. { return token_type::parse_error; } . { return token_type::parse_error; }
*/ */
}
} }
inline std::string get_string_value() const inline std::string get_token() const
{ {
return std::string(m_start, static_cast<size_t>(m_cursor - m_start)); return std::string(m_start, static_cast<size_t>(m_cursor - m_start));
} }
@ -2612,15 +2617,9 @@ class basic_json
char* endptr; char* endptr;
const auto float_val = std::strtod(reinterpret_cast<const char*>(m_start), &endptr); const auto float_val = std::strtod(reinterpret_cast<const char*>(m_start), &endptr);
// check if strtod read beyond the end of the lexem // return float_val if the whole number was translated and NAN
if (endptr != m_cursor) // otherwise
{ return (endptr == m_cursor) ? float_val : NAN;
return NAN;
}
else
{
return float_val;
}
} }
private: private:
@ -2787,10 +2786,12 @@ class basic_json
{ {
auto float_val = m_lexer.get_number(); auto float_val = m_lexer.get_number();
// NAN is returned if token could not be translated
// completely
if (std::isnan(float_val)) if (std::isnan(float_val))
{ {
throw std::invalid_argument(std::string("parse error - ") + throw std::invalid_argument(std::string("parse error - ") +
m_lexer.get_string_value() + " is not a number"); m_lexer.get_token() + " is not a number");
} }
get_token(); get_token();
@ -2812,7 +2813,7 @@ class basic_json
default: default:
{ {
std::string error_msg = "parse error - unexpected \'"; std::string error_msg = "parse error - unexpected \'";
error_msg += m_lexer.get_string_value(); error_msg += m_lexer.get_token();
error_msg += "\' ("; error_msg += "\' (";
error_msg += lexer::token_type_name(last_token) + ")"; error_msg += lexer::token_type_name(last_token) + ")";
throw std::invalid_argument(error_msg); throw std::invalid_argument(error_msg);
@ -2832,7 +2833,7 @@ class basic_json
if (t != last_token) if (t != last_token)
{ {
std::string error_msg = "parse error - unexpected \'"; std::string error_msg = "parse error - unexpected \'";
error_msg += m_lexer.get_string_value(); error_msg += m_lexer.get_token();
error_msg += "\' (" + lexer::token_type_name(last_token); error_msg += "\' (" + lexer::token_type_name(last_token);
error_msg += "); expected " + lexer::token_type_name(t); error_msg += "); expected " + lexer::token_type_name(t);
throw std::invalid_argument(error_msg); throw std::invalid_argument(error_msg);
@ -2844,6 +2845,7 @@ class basic_json
std::string m_buffer; std::string m_buffer;
/// the type of the last read token /// the type of the last read token
typename lexer::token_type last_token = lexer::token_type::uninitialized; typename lexer::token_type last_token = lexer::token_type::uninitialized;
/// the lexer
lexer m_lexer; lexer m_lexer;
}; };
}; };

18
test/unit.cpp
View file

@ -3630,6 +3630,8 @@ TEST_CASE("capacity")
{ {
CHECK(std::distance(j.begin(), j.end()) == j.size()); CHECK(std::distance(j.begin(), j.end()) == j.size());
CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size()); CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size());
CHECK(std::distance(j.rbegin(), j.rend()) == j.size());
CHECK(std::distance(j_const.crbegin(), j_const.crend()) == j_const.size());
} }
} }
@ -3648,6 +3650,8 @@ TEST_CASE("capacity")
{ {
CHECK(std::distance(j.begin(), j.end()) == j.size()); CHECK(std::distance(j.begin(), j.end()) == j.size());
CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size()); CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size());
CHECK(std::distance(j.rbegin(), j.rend()) == j.size());
CHECK(std::distance(j_const.crbegin(), j_const.crend()) == j_const.size());
} }
} }
@ -3668,6 +3672,8 @@ TEST_CASE("capacity")
{ {
CHECK(std::distance(j.begin(), j.end()) == j.size()); CHECK(std::distance(j.begin(), j.end()) == j.size());
CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size()); CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size());
CHECK(std::distance(j.rbegin(), j.rend()) == j.size());
CHECK(std::distance(j_const.crbegin(), j_const.crend()) == j_const.size());
} }
} }
@ -3686,6 +3692,8 @@ TEST_CASE("capacity")
{ {
CHECK(std::distance(j.begin(), j.end()) == j.size()); CHECK(std::distance(j.begin(), j.end()) == j.size());
CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size()); CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size());
CHECK(std::distance(j.rbegin(), j.rend()) == j.size());
CHECK(std::distance(j_const.crbegin(), j_const.crend()) == j_const.size());
} }
} }
} }
@ -3707,6 +3715,8 @@ TEST_CASE("capacity")
{ {
CHECK(std::distance(j.begin(), j.end()) == j.size()); CHECK(std::distance(j.begin(), j.end()) == j.size());
CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size()); CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size());
CHECK(std::distance(j.rbegin(), j.rend()) == j.size());
CHECK(std::distance(j_const.crbegin(), j_const.crend()) == j_const.size());
} }
} }
@ -3725,6 +3735,8 @@ TEST_CASE("capacity")
{ {
CHECK(std::distance(j.begin(), j.end()) == j.size()); CHECK(std::distance(j.begin(), j.end()) == j.size());
CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size()); CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size());
CHECK(std::distance(j.rbegin(), j.rend()) == j.size());
CHECK(std::distance(j_const.crbegin(), j_const.crend()) == j_const.size());
} }
} }
} }
@ -3744,6 +3756,8 @@ TEST_CASE("capacity")
{ {
CHECK(std::distance(j.begin(), j.end()) == j.size()); CHECK(std::distance(j.begin(), j.end()) == j.size());
CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size()); CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size());
CHECK(std::distance(j.rbegin(), j.rend()) == j.size());
CHECK(std::distance(j_const.crbegin(), j_const.crend()) == j_const.size());
} }
} }
@ -3762,6 +3776,8 @@ TEST_CASE("capacity")
{ {
CHECK(std::distance(j.begin(), j.end()) == j.size()); CHECK(std::distance(j.begin(), j.end()) == j.size());
CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size()); CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size());
CHECK(std::distance(j.rbegin(), j.rend()) == j.size());
CHECK(std::distance(j_const.crbegin(), j_const.crend()) == j_const.size());
} }
} }
@ -3780,6 +3796,8 @@ TEST_CASE("capacity")
{ {
CHECK(std::distance(j.begin(), j.end()) == j.size()); CHECK(std::distance(j.begin(), j.end()) == j.size());
CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size()); CHECK(std::distance(j_const.begin(), j_const.end()) == j_const.size());
CHECK(std::distance(j.rbegin(), j.rend()) == j.size());
CHECK(std::distance(j_const.crbegin(), j_const.crend()) == j_const.size());
} }
} }
} }