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

♻️ adjusting lexer/parser in symmetry to #1006

Browse source
This commit is contained in:
Niels Lohmann 2018-03-12 19:15:11 +01:00
parent b56ac86471
commit 8557151d90
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
5 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/nlohmann/detail/input/lexer.hpp
View file

@ -32,6 +32,7 @@ class lexer
using number_integer_t = typename BasicJsonType::number_integer_t;
using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
using number_float_t = typename BasicJsonType::number_float_t;
using string_t = typename BasicJsonType::string_t;
public:
/// token types for the parser
@ -1130,7 +1131,7 @@ scan_number_done:
}
/// return current string value (implicitly resets the token; useful only once)
std::string&& move_string()
string_t&& move_string()
{
return std::move(token_buffer);
}
@ -1260,7 +1261,7 @@ scan_number_done:
std::vector<char> token_string {};
/// buffer for variable-length tokens (numbers, strings)
std::string token_buffer {};
string_t token_buffer {};
/// a description of occurred lexer errors
const char* error_message = "";

3
include/nlohmann/detail/input/parser.hpp
View file

@ -32,6 +32,7 @@ class parser
using number_integer_t = typename BasicJsonType::number_integer_t;
using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
using number_float_t = typename BasicJsonType::number_float_t;
using string_t = typename BasicJsonType::string_t;
using lexer_t = lexer<BasicJsonType>;
using token_type = typename lexer_t::token_type;
@ -175,7 +176,7 @@ class parser
}
// parse values
std::string key;
string_t key;
BasicJsonType value;
while (true)
{