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

🔨 removed unget function for wstring parsers

Browse source
This commit is contained in:
Niels Lohmann 2018-05-06 14:05:29 +02:00
parent 5ff2abb90d
commit ae213721b1
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
1 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/nlohmann/detail/input/input_adapters.hpp
View file

@ -123,13 +123,6 @@ class wide_string_input_adapter : public input_adapter_protocol
std::char_traits<char>::int_type get_character() noexcept override std::char_traits<char>::int_type get_character() noexcept override
{ {
// unget_character() was called previously: return the last character
if (next_unget)
{
next_unget = false;
return last_char;
}
// check if buffer needs to be filled // check if buffer needs to be filled
if (utf8_bytes_index == utf8_bytes_filled) if (utf8_bytes_index == utf8_bytes_filled)
{ {
@ -149,12 +142,7 @@ class wide_string_input_adapter : public input_adapter_protocol
// use buffer // use buffer
assert(utf8_bytes_filled > 0); assert(utf8_bytes_filled > 0);
assert(utf8_bytes_index < utf8_bytes_filled); assert(utf8_bytes_index < utf8_bytes_filled);
return (last_char = utf8_bytes[utf8_bytes_index++]); return utf8_bytes[utf8_bytes_index++];
}
void unget_character() noexcept override
{
next_unget = true;
} }
private: private:
@ -278,11 +266,6 @@ class wide_string_input_adapter : public input_adapter_protocol
std::size_t utf8_bytes_index = 0; std::size_t utf8_bytes_index = 0;
/// number of valid bytes in the utf8_codes array /// number of valid bytes in the utf8_codes array
std::size_t utf8_bytes_filled = 0; std::size_t utf8_bytes_filled = 0;
/// the last character (returned after unget_character() is called)
std::char_traits<char>::int_type last_char = 0;
/// whether get_character() should return last_char
bool next_unget = false;
}; };
class input_adapter class input_adapter