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
31bfabc4
Unverified
Commit
31bfabc4
authored
Jan 10, 2018
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔨
optimized input format
parent
965a70e3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
149 additions
and
61 deletions
+149
-61
src/json.hpp
src/json.hpp
+149
-61
No files found.
src/json.hpp
View file @
31bfabc4
...
@@ -5223,59 +5223,7 @@ class binary_reader
...
@@ -5223,59 +5223,7 @@ class binary_reader
*/
*/
BasicJsonType
parse_ubjson_internal
(
const
bool
get_char
=
true
)
BasicJsonType
parse_ubjson_internal
(
const
bool
get_char
=
true
)
{
{
switch
(
get_char
?
get
()
:
current
)
return
get_ubjson_value
(
get_char
?
get_ignore_noop
()
:
current
);
{
case
std
:
:
char_traits
<
char
>::
eof
()
:
// EOF
JSON_THROW
(
parse_error
::
create
(
110
,
chars_read
,
"unexpected end of input"
));
case
'T'
:
// true
return
true
;
case
'F'
:
// false
return
false
;
case
'Z'
:
// null
return
nullptr
;
case
'N'
:
// no-op
return
parse_ubjson_internal
();
// read next byte
case
'U'
:
return
get_number
<
uint8_t
>
();
case
'i'
:
return
get_number
<
int8_t
>
();
case
'I'
:
return
get_number
<
int16_t
>
();
case
'l'
:
return
get_number
<
int32_t
>
();
case
'L'
:
return
get_number
<
int64_t
>
();
case
'd'
:
return
get_number
<
float
>
();
case
'D'
:
return
get_number
<
double
>
();
case
'C'
:
// char
{
get
();
check_eof
();
return
std
::
string
(
1
,
static_cast
<
char
>
(
current
));
}
case
'S'
:
// string
return
get_ubjson_string
();
case
'['
:
// array
return
get_ubjson_array
();
case
'{'
:
// object
return
get_ubjson_object
();
default:
// anything else
std
::
stringstream
ss
;
ss
<<
std
::
setw
(
2
)
<<
std
::
uppercase
<<
std
::
setfill
(
'0'
)
<<
std
::
hex
<<
current
;
JSON_THROW
(
parse_error
::
create
(
112
,
chars_read
,
"error reading UBJSON; last byte: 0x"
+
ss
.
str
()));
}
}
}
/*!
/*!
...
@@ -5293,6 +5241,20 @@ class binary_reader
...
@@ -5293,6 +5241,20 @@ class binary_reader
return
(
current
=
ia
->
get_character
());
return
(
current
=
ia
->
get_character
());
}
}
/*!
@return character read from the input after ignoring all 'N' entries
*/
int
get_ignore_noop
()
{
do
{
get
();
}
while
(
current
==
'N'
);
return
current
;
}
/*
/*
@brief read a number from the input
@brief read a number from the input
...
@@ -5622,18 +5584,124 @@ class binary_reader
...
@@ -5622,18 +5584,124 @@ class binary_reader
}
}
}
}
std
::
pair
<
std
::
size_t
,
int
>
get_ubjson_size_type
()
{
std
::
size_t
sz
=
std
::
string
::
npos
;
int
tc
=
0
;
get_ignore_noop
();
switch
(
current
)
{
case
'$'
:
{
get_ignore_noop
();
check_eof
();
tc
=
current
;
get_ignore_noop
();
if
(
current
!=
'#'
)
{
assert
(
false
);
}
sz
=
parse_ubjson_internal
();
break
;
}
case
'#'
:
{
sz
=
parse_ubjson_internal
();
break
;
}
default:
break
;
}
return
std
::
make_pair
(
sz
,
tc
);
}
BasicJsonType
get_ubjson_value
(
const
int
prefix
)
{
switch
(
prefix
)
{
case
std
:
:
char_traits
<
char
>::
eof
()
:
// EOF
JSON_THROW
(
parse_error
::
create
(
110
,
chars_read
,
"unexpected end of input"
));
case
'T'
:
// true
return
true
;
case
'F'
:
// false
return
false
;
case
'Z'
:
// null
return
nullptr
;
case
'U'
:
return
get_number
<
uint8_t
>
();
case
'i'
:
return
get_number
<
int8_t
>
();
case
'I'
:
return
get_number
<
int16_t
>
();
case
'l'
:
return
get_number
<
int32_t
>
();
case
'L'
:
return
get_number
<
int64_t
>
();
case
'd'
:
return
get_number
<
float
>
();
case
'D'
:
return
get_number
<
double
>
();
case
'C'
:
// char
{
get
();
check_eof
();
return
std
::
string
(
1
,
static_cast
<
char
>
(
current
));
}
case
'S'
:
// string
return
get_ubjson_string
();
case
'['
:
// array
return
get_ubjson_array
();
case
'{'
:
// object
return
get_ubjson_object
();
default:
// anything else
std
::
stringstream
ss
;
ss
<<
std
::
setw
(
2
)
<<
std
::
uppercase
<<
std
::
setfill
(
'0'
)
<<
std
::
hex
<<
current
;
JSON_THROW
(
parse_error
::
create
(
112
,
chars_read
,
"error reading UBJSON; last byte: 0x"
+
ss
.
str
()));
}
}
BasicJsonType
get_ubjson_array
()
BasicJsonType
get_ubjson_array
()
{
{
BasicJsonType
result
=
value_t
::
array
;
BasicJsonType
result
=
value_t
::
array
;
const
auto
size_and_type
=
get_ubjson_size_type
();
while
(
get
()
!=
']'
)
if
(
size_and_type
.
first
!=
std
::
string
::
npos
)
{
for
(
std
::
size_t
i
=
0
;
i
<
size_and_type
.
first
;
++
i
)
{
if
(
size_and_type
.
second
!=
0
)
{
result
.
push_back
(
get_ubjson_value
(
size_and_type
.
second
));
}
else
{
result
.
push_back
(
parse_ubjson_internal
());
}
}
}
else
{
{
// skip no-op
while
(
current
!=
']'
)
if
(
current
==
'N'
)
{
{
continue
;
result
.
push_back
(
parse_ubjson_internal
(
false
));
get_ignore_noop
();
}
}
result
.
push_back
(
parse_ubjson_internal
(
false
));
}
}
return
result
;
return
result
;
...
@@ -5642,11 +5710,31 @@ class binary_reader
...
@@ -5642,11 +5710,31 @@ class binary_reader
BasicJsonType
get_ubjson_object
()
BasicJsonType
get_ubjson_object
()
{
{
BasicJsonType
result
=
value_t
::
object
;
BasicJsonType
result
=
value_t
::
object
;
const
auto
size_and_type
=
get_ubjson_size_type
();
while
(
get
()
!=
'}'
)
if
(
size_and_type
.
first
!=
std
::
string
::
npos
)
{
for
(
std
::
size_t
i
=
0
;
i
<
size_and_type
.
first
;
++
i
)
{
auto
key
=
get_ubjson_string
();
if
(
size_and_type
.
second
!=
0
)
{
result
[
std
::
move
(
key
)]
=
get_ubjson_value
(
size_and_type
.
second
);
}
else
{
result
[
std
::
move
(
key
)]
=
parse_ubjson_internal
();
}
}
}
else
{
{
auto
key
=
get_ubjson_string
(
false
);
while
(
current
!=
'}'
)
result
[
std
::
move
(
key
)]
=
parse_ubjson_internal
();
{
auto
key
=
get_ubjson_string
(
false
);
result
[
std
::
move
(
key
)]
=
parse_ubjson_internal
();
get_ignore_noop
();
}
}
}
return
result
;
return
result
;
...
...
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