Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
5d280143
Commit
5d280143
authored
Feb 11, 2015
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes
parent
8a4e127a
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
266 additions
and
217 deletions
+266
-217
src/json.hpp
src/json.hpp
+228
-176
src/json.hpp.re2c
src/json.hpp.re2c
+32
-19
test/unit.cpp
test/unit.cpp
+6
-22
No files found.
src/json.hpp
View file @
5d280143
This diff is collapsed.
Click to expand it.
src/json.hpp.re2c
View file @
5d280143
...
@@ -2415,19 +2415,30 @@ class basic_json
...
@@ -2415,19 +2415,30 @@ class basic_json
inline lexer() = default;
inline lexer() = default;
/*!max:re2c */
/*!
This function implements a scanner for JSON. It is specified using
regular expressions that try to follow RFC 7159 and ECMA-404 as close
as possible. These regular expressions are then translated into a
deterministic finite automaton (DFA) by the tool RE2C. As a result, the
translated code for this function consists of a large block of code
with goto jumps.
@return the class of the next token read from the buffer
@todo Unicode support needs to be checked.
*/
inline token_type scan()
inline token_type scan()
{
{
#define YYFILL(n)
m_start = m_cursor;
/*!re2c
/*!re2c
re2c:define:YYCURSOR = m_cursor;
re2c:define:YYCURSOR = m_cursor;
re2c:define:YYLIMIT = m_limit;
re2c:define:YYLIMIT = m_limit;
re2c:define:YYCTYPE = char;
re2c:define:YYCTYPE = char;
re2c:define:YYCTXMARKER = m_ctxmarker;
re2c:define:YYMARKER = m_marker;
re2c:define:YYMARKER = m_marker;
re2c:indent:top = 1;
re2c:indent:top = 1;
re2c:yyfill:enable = 0;
re2c:yyfill:enable = 0;
re2c:labelprefix = "json_parser_";
// structural characters
// structural characters
"[" { return token_type::begin_array; }
"[" { return token_type::begin_array; }
...
@@ -2466,7 +2477,7 @@ class basic_json
...
@@ -2466,7 +2477,7 @@ class basic_json
string { return token_type::value_string; }
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; }
*/
*/
}
}
...
@@ -2476,11 +2487,11 @@ class basic_json
...
@@ -2476,11 +2487,11 @@ class basic_json
}
}
/*!
/*!
The pointer m_
begin
points to the opening quote of the string, and
The pointer m_
start
points to the opening quote of the string, and
m_cursor past the closing quote of the string. We create a std::string
from
m_cursor past the closing quote of the string. We create a std::string
the character after the opening quotes (m_begin+1) until the character
from the character after the opening quotes (m_begin+1) until the
before the closing quotes (hence subtracting 2 characters from the pointer
character before the closing quotes (hence subtracting 2 characters
difference of the two pointers).
from the pointer
difference of the two pointers).
@return string value of current token without opening and closing quotes
@return string value of current token without opening and closing quotes
...
@@ -2493,14 +2504,13 @@ class basic_json
...
@@ -2493,14 +2504,13 @@ class basic_json
inline number_float_t get_number() const
inline number_float_t get_number() const
{
{
// The pointer m_begin points to the beginning of the
// The pointer m_begin points to the beginning of the parsed
// parsed number. We pass this pointer to std::strtod which
// number. We pass this pointer to std::strtod which sets endptr to
// sets endptr to the first character past the converted
// the first character past the converted number. If this pointer is
// number. If this pointer is not the same as m_cursor,
// not the same as m_cursor, then either more or less characters
// then either more or less characters have been used
// have been used during the comparison. This can happen for inputs
// during the comparison. This can happen for inputs like
// like "01" which will be treated like number 0 followed by number
// "01" which will be treated like number 0 followed by
// 1.
// number 1.
// conversion
// conversion
char* endptr;
char* endptr;
...
@@ -2519,13 +2529,16 @@ class basic_json
...
@@ -2519,13 +2529,16 @@ class basic_json
}
}
private:
private:
/// the buffer
const char* m_content = nullptr;
const char* m_content = nullptr;
/// pointer to he beginning of the current symbol
const char* m_start = nullptr;
const char* m_start = nullptr;
/// pointer to the current symbol
const char* m_cursor = nullptr;
const char* m_cursor = nullptr;
/// pointer to the end of the buffer
const char* m_limit = nullptr;
const char* m_limit = nullptr;
/// pointer for backtracking information
const char* m_marker = nullptr;
const char* m_marker = nullptr;
const char* m_ctxmarker = nullptr;
};
};
class parser
class parser
...
...
test/unit.cpp
View file @
5d280143
...
@@ -3892,43 +3892,27 @@ TEST_CASE("deserialization")
...
@@ -3892,43 +3892,27 @@ TEST_CASE("deserialization")
{
{
SECTION
(
"string"
)
SECTION
(
"string"
)
{
{
// auto s = "[\"foo\",1,2,3,false,{\"one\":1}]";
auto
s
=
"[
\"
foo
\"
,1,2,3,false,{
\"
one
\"
:1}]"
;
// json j = json::parse(s);
// CHECK(j == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
auto
s
=
"null"
;
json
j
=
json
::
parse
(
s
);
json
j
=
json
::
parse
(
s
);
CHECK
(
j
==
json
());
CHECK
(
j
==
json
(
{
"foo"
,
1
,
2
,
3
,
false
,
{{
"one"
,
1
}}}
));
}
}
SECTION
(
"operator<<"
)
SECTION
(
"operator<<"
)
{
{
// std::stringstream ss;
// ss << "[\"foo\",1,2,3,false,{\"one\":1}]";
// json j;
// j << ss;
// CHECK(j == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
std
::
stringstream
ss
;
std
::
stringstream
ss
;
ss
<<
"
null
"
;
ss
<<
"
[
\"
foo
\"
,1,2,3,false,{
\"
one
\"
:1}]
"
;
json
j
;
json
j
;
j
<<
ss
;
j
<<
ss
;
CHECK
(
j
==
json
());
CHECK
(
j
==
json
(
{
"foo"
,
1
,
2
,
3
,
false
,
{{
"one"
,
1
}}}
));
}
}
SECTION
(
"operator>>"
)
SECTION
(
"operator>>"
)
{
{
// std::stringstream ss;
// ss << "[\"foo\",1,2,3,false,{\"one\":1}]";
// json j;
// ss >> j;
// CHECK(j == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
std
::
stringstream
ss
;
std
::
stringstream
ss
;
ss
<<
"
null
"
;
ss
<<
"
[
\"
foo
\"
,1,2,3,false,{
\"
one
\"
:1}]
"
;
json
j
;
json
j
;
ss
>>
j
;
ss
>>
j
;
CHECK
(
j
==
json
());
CHECK
(
j
==
json
(
{
"foo"
,
1
,
2
,
3
,
false
,
{{
"one"
,
1
}}}
));
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment