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

minor changes to pull request #40

Browse source
This commit is contained in:
Niels 2015-03-24 18:05:58 +01:00
parent 50e06a7bd1
commit 0707030bc5
3 changed files with 108 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -353,7 +353,7 @@ I deeply appreciate the help of the following people.
- [kirkshoop](https://github.com/kirkshoop) made the iterators of the class composable to other libraries. - [kirkshoop](https://github.com/kirkshoop) made the iterators of the class composable to other libraries.
- [wancw](https://github.com/wanwc) fixed a bug that hindered the class to compile with Clang. - [wancw](https://github.com/wanwc) fixed a bug that hindered the class to compile with Clang.
- Tomas Åblad found a bug in the iterator implementation. - Tomas Åblad found a bug in the iterator implementation.
- [Joshua C. Randall](https://github.com/jrandall) fixed a bug in the floating-point serialization. - [Joshua C. Randall](https://github.com/jrandall) fixed a bug in the floating-point serialization and implemented code to parse streams incrementally.
Thanks a lot for helping out! Thanks a lot for helping out!

112
src/json.hpp
View file

@ -1739,6 +1739,12 @@ class basic_json
return parser(s).parse(); return parser(s).parse();
} }
/// deserialize from stream
static basic_json parse(std::istream& i)
{
return parser(i).parse();
}
/// deserialize from stream /// deserialize from stream
friend std::istream& operator>>(std::istream& i, basic_json& j) friend std::istream& operator>>(std::istream& i, basic_json& j)
{ {
@ -3112,11 +3118,20 @@ class basic_json
/// constructor with a given buffer /// constructor with a given buffer
inline lexer(const string_t& s) noexcept inline lexer(const string_t& s) noexcept
: m_content(reinterpret_cast<const lexer_char_t*>(s.c_str())) : m_stream(nullptr), m_buffer(s)
{ {
m_content = reinterpret_cast<const lexer_char_t*>(s.c_str());
m_start = m_cursor = m_content; m_start = m_cursor = m_content;
m_limit = m_content + s.size(); m_limit = m_content + s.size();
} }
inline lexer(std::istream* s) noexcept
: m_stream(s)
{
getline(*m_stream, m_buffer);
m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str());
m_start = m_cursor = m_content;
m_limit = m_content + m_buffer.size();
}
/// default constructor /// default constructor
inline lexer() = default; inline lexer() = default;
@ -3242,7 +3257,7 @@ class basic_json
inline token_type scan() noexcept inline token_type scan() noexcept
{ {
// pointer for backtracking information // pointer for backtracking information
const lexer_char_t* m_marker = nullptr; m_marker = nullptr;
// remember the begin of the token // remember the begin of the token
m_start = m_cursor; m_start = m_cursor;
@ -3287,6 +3302,10 @@ class basic_json
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; yych = *m_cursor;
if (yych <= '9') if (yych <= '9')
{ {
@ -3418,6 +3437,10 @@ basic_json_parser_3:
} }
basic_json_parser_4: basic_json_parser_4:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor)
{
yyfill();
};
yych = *m_cursor; yych = *m_cursor;
basic_json_parser_5: basic_json_parser_5:
if (yybm[0 + yych] & 32) if (yybm[0 + yych] & 32)
@ -3544,6 +3567,10 @@ basic_json_parser_29:
goto basic_json_parser_19; goto basic_json_parser_19;
basic_json_parser_30: basic_json_parser_30:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor)
{
yyfill();
};
yych = *m_cursor; yych = *m_cursor;
basic_json_parser_31: basic_json_parser_31:
if (yybm[0 + yych] & 64) if (yybm[0 + yych] & 64)
@ -3571,6 +3598,10 @@ basic_json_parser_32:
} }
basic_json_parser_33: basic_json_parser_33:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor)
{
yyfill();
};
yych = *m_cursor; yych = *m_cursor;
if (yych <= 'e') if (yych <= 'e')
{ {
@ -3651,6 +3682,10 @@ basic_json_parser_34:
} }
basic_json_parser_36: basic_json_parser_36:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor)
{
yyfill();
};
yych = *m_cursor; yych = *m_cursor;
if (yych <= '@') if (yych <= '@')
{ {
@ -3680,6 +3715,10 @@ basic_json_parser_36:
} }
basic_json_parser_37: basic_json_parser_37:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor)
{
yyfill();
};
yych = *m_cursor; yych = *m_cursor;
if (yych <= '@') if (yych <= '@')
{ {
@ -3709,6 +3748,10 @@ basic_json_parser_37:
} }
basic_json_parser_38: basic_json_parser_38:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor)
{
yyfill();
};
yych = *m_cursor; yych = *m_cursor;
if (yych <= '@') if (yych <= '@')
{ {
@ -3738,6 +3781,10 @@ basic_json_parser_38:
} }
basic_json_parser_39: basic_json_parser_39:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor)
{
yyfill();
};
yych = *m_cursor; yych = *m_cursor;
if (yych <= '@') if (yych <= '@')
{ {
@ -3770,6 +3817,10 @@ basic_json_parser_39:
basic_json_parser_40: basic_json_parser_40:
yyaccept = 1; yyaccept = 1;
m_marker = ++m_cursor; m_marker = ++m_cursor;
if ((m_limit - m_cursor) < 3)
{
yyfill();
};
yych = *m_cursor; yych = *m_cursor;
basic_json_parser_41: basic_json_parser_41:
if (yybm[0 + yych] & 128) if (yybm[0 + yych] & 128)
@ -3843,6 +3894,10 @@ basic_json_parser_44:
} }
basic_json_parser_45: basic_json_parser_45:
++m_cursor; ++m_cursor;
if (m_limit <= m_cursor)
{
yyfill();
};
yych = *m_cursor; yych = *m_cursor;
if (yych <= '/') if (yych <= '/')
{ {
@ -3856,6 +3911,10 @@ basic_json_parser_45:
basic_json_parser_47: basic_json_parser_47:
yyaccept = 1; yyaccept = 1;
m_marker = ++m_cursor; m_marker = ++m_cursor;
if ((m_limit - m_cursor) < 3)
{
yyfill();
};
yych = *m_cursor; yych = *m_cursor;
if (yych <= 'D') if (yych <= 'D')
{ {
@ -3956,6 +4015,31 @@ basic_json_parser_59:
} }
} }
}
/// append data from the stream to the internal buffer
inline void yyfill() noexcept
{
if (not m_stream or not * m_stream)
{
return;
}
const ssize_t offset_start = m_start - m_content;
const ssize_t offset_marker = m_marker - m_start;
const ssize_t offset_cursor = m_cursor - m_start;
m_buffer.erase(0, static_cast<size_t>(offset_start));
std::string line;
std::getline(*m_stream, line);
m_buffer += line;
m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str());
m_start = m_content;
m_marker = m_start + offset_marker;
m_cursor = m_start + offset_cursor;
m_limit = m_start + m_buffer.size() - 1;
} }
/// return string representation of last read token /// return string representation of last read token
@ -4120,10 +4204,16 @@ basic_json_parser_59:
} }
private: private:
/// optional input stream
std::istream* m_stream;
/// the buffer /// the buffer
string_t m_buffer;
/// the buffer pointer
const lexer_char_t* m_content = nullptr; const lexer_char_t* m_content = nullptr;
/// pointer to he beginning of the current symbol /// pointer to the beginning of the current symbol
const lexer_char_t* m_start = nullptr; const lexer_char_t* m_start = nullptr;
/// pointer for backtracking information
const lexer_char_t* m_marker = nullptr;
/// pointer to the current symbol /// pointer to the current symbol
const lexer_char_t* m_cursor = nullptr; const lexer_char_t* m_cursor = nullptr;
/// pointer to the end of the buffer /// pointer to the end of the buffer
@ -4137,25 +4227,15 @@ basic_json_parser_59:
{ {
public: public:
/// constructor for strings /// constructor for strings
inline parser(const string_t& s) : m_buffer(s), m_lexer(m_buffer) inline parser(const string_t& s) : m_lexer(s)
{ {
// read first token // read first token
get_token(); get_token();
} }
/// a parser reading from an input stream /// a parser reading from an input stream
inline parser(std::istream& _is) inline parser(std::istream& _is) : m_lexer(&_is)
{ {
while (_is)
{
string_t input_line;
std::getline(_is, input_line);
m_buffer += input_line;
}
// initializer lexer
m_lexer = lexer(m_buffer);
// read first token // read first token
get_token(); get_token();
} }
@ -4341,8 +4421,6 @@ basic_json_parser_59:
} }
private: private:
/// the buffer
string_t 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 /// the lexer

21
src/json.hpp.re2c
View file

@ -3118,7 +3118,7 @@ class basic_json
/// constructor with a given buffer /// constructor with a given buffer
inline lexer(const string_t& s) noexcept inline lexer(const string_t& s) noexcept
: m_buffer(s), m_stream(nullptr) : m_stream(nullptr), m_buffer(s)
{ {
m_content = reinterpret_cast<const lexer_char_t*>(s.c_str()); m_content = reinterpret_cast<const lexer_char_t*>(s.c_str());
m_start = m_cursor = m_content; m_start = m_cursor = m_content;
@ -3325,15 +3325,18 @@ class basic_json
} }
/// append data from the stream to the internal buffer /// append data from the stream to the internal buffer
void yyfill() noexcept inline void yyfill() noexcept
{ {
if (not m_stream or not *m_stream) return; if (not m_stream or not * m_stream)
{
return;
}
ssize_t offset_start = m_start - m_content; const ssize_t offset_start = m_start - m_content;
ssize_t offset_marker = m_marker - m_start; const ssize_t offset_marker = m_marker - m_start;
ssize_t offset_cursor = m_cursor - m_start; const ssize_t offset_cursor = m_cursor - m_start;
m_buffer.erase(0, offset_start); m_buffer.erase(0, static_cast<size_t>(offset_start));
std::string line; std::string line;
std::getline(*m_stream, line); std::getline(*m_stream, line);
m_buffer += line; m_buffer += line;
@ -3530,14 +3533,14 @@ class basic_json
{ {
public: public:
/// constructor for strings /// constructor for strings
inline parser(const string_t& s) : m_lexer(s) inline parser(const string_t& s) : m_lexer(s)
{ {
// read first token // read first token
get_token(); get_token();
} }
/// a parser reading from an input stream /// a parser reading from an input stream
inline parser(std::istream& _is) : m_lexer(&_is) inline parser(std::istream& _is) : m_lexer(&_is)
{ {
// read first token // read first token
get_token(); get_token();