mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Tweak std/json's decode_tokens return values
This commit is contained in:
1 parent
ae7062065b
commit
9d35cf00ac
2 files changed
+70
-56
No files matched your search
@@ -18137,6 +18137,8 @@ const char* wuffs_json__error__unsupported_number_length =
|
||||
"#json: unsupported number length";
|
||||
const char* wuffs_json__error__unsupported_recursion_depth =
|
||||
"#json: unsupported recursion depth";
|
||||
const char* wuffs_json__error__internal_error_inconsistent_i_o =
|
||||
"#json: internal error: inconsistent I/O";
|
||||
|
||||
// ---------------- Private Consts
|
||||
|
||||
@@ -18232,6 +18234,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self,
|
||||
wuffs_base__status status = wuffs_base__make_status(NULL);
|
||||
|
||||
uint32_t v_number_length = 0;
|
||||
uint32_t v_number_status = 0;
|
||||
uint32_t v_string_length = 0;
|
||||
uint32_t v_whitespace_length = 0;
|
||||
uint32_t v_depth = 0;
|
||||
@@ -18456,29 +18459,41 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self,
|
||||
if (a_src) {
|
||||
iop_a_src = a_src->data.ptr + a_src->meta.ri;
|
||||
}
|
||||
if (v_number_length > 1) {
|
||||
v_number_length -= 1;
|
||||
v_number_status = (v_number_length >> 8);
|
||||
v_number_length = (v_number_length & 255);
|
||||
if (v_number_status == 0) {
|
||||
*iop_a_dst++ = wuffs_base__make_token(
|
||||
(((uint64_t)(4194306)) << WUFFS_BASE__TOKEN__VALUE__SHIFT) |
|
||||
(((uint64_t)(((uint64_t)(v_number_length))))
|
||||
<< WUFFS_BASE__TOKEN__LENGTH__SHIFT));
|
||||
goto label_4_break;
|
||||
} else if (v_number_length < 1) {
|
||||
}
|
||||
while (v_number_length > 0) {
|
||||
v_number_length -= 1;
|
||||
if (iop_a_src > io1_a_src) {
|
||||
(iop_a_src--, wuffs_base__make_empty_struct());
|
||||
} else {
|
||||
status = wuffs_base__make_status(
|
||||
wuffs_json__error__internal_error_inconsistent_i_o);
|
||||
goto exit;
|
||||
}
|
||||
}
|
||||
if (v_number_status == 1) {
|
||||
status = wuffs_base__make_status(wuffs_json__error__bad_input);
|
||||
goto exit;
|
||||
} else if (v_number_status == 2) {
|
||||
status = wuffs_base__make_status(
|
||||
wuffs_json__error__unsupported_number_length);
|
||||
goto exit;
|
||||
}
|
||||
if (a_src && a_src->meta.closed) {
|
||||
status = wuffs_base__make_status(wuffs_json__error__bad_input);
|
||||
goto exit;
|
||||
}
|
||||
status =
|
||||
wuffs_base__make_status(wuffs_base__suspension__short_read);
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6);
|
||||
while (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0) {
|
||||
} else {
|
||||
status =
|
||||
wuffs_base__make_status(wuffs_base__suspension__short_write);
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7);
|
||||
wuffs_base__make_status(wuffs_base__suspension__short_read);
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6);
|
||||
while (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0) {
|
||||
status = wuffs_base__make_status(
|
||||
wuffs_base__suspension__short_write);
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7);
|
||||
}
|
||||
}
|
||||
}
|
||||
label_4_break:;
|
||||
@@ -18666,39 +18681,27 @@ wuffs_json__decoder__decode_number(wuffs_json__decoder* self,
|
||||
v_n = 0;
|
||||
while (true) {
|
||||
if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) {
|
||||
if (a_src && a_src->meta.closed) {
|
||||
if (a_src) {
|
||||
a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
|
||||
}
|
||||
return (v_n + 1);
|
||||
if (!(a_src && a_src->meta.closed)) {
|
||||
v_n |= 768;
|
||||
}
|
||||
goto label_0_break;
|
||||
}
|
||||
v_c = wuffs_base__load_u8be(iop_a_src);
|
||||
if ((v_c < 48) || (57 < v_c)) {
|
||||
if (a_src) {
|
||||
a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
|
||||
}
|
||||
return (v_n + 1);
|
||||
goto label_0_break;
|
||||
}
|
||||
if (v_n >= 49) {
|
||||
if (a_src) {
|
||||
a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
|
||||
}
|
||||
return 0;
|
||||
v_n |= 512;
|
||||
goto label_0_break;
|
||||
}
|
||||
v_n += 1;
|
||||
(iop_a_src += 1, wuffs_base__make_empty_struct());
|
||||
}
|
||||
label_0_break:;
|
||||
while ((v_n > 0) && (iop_a_src > io1_a_src)) {
|
||||
v_n -= 1;
|
||||
(iop_a_src--, wuffs_base__make_empty_struct());
|
||||
}
|
||||
if (a_src) {
|
||||
a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
|
||||
}
|
||||
return 1;
|
||||
return v_n;
|
||||
}
|
||||
|
||||
#endif // !defined(WUFFS_CONFIG__MODULES) ||
|
||||
|
||||
+35
-24
@@ -18,6 +18,8 @@ pub status "#bad input"
|
||||
pub status "#unsupported number length"
|
||||
pub status "#unsupported recursion depth"
|
||||
|
||||
pri status "#internal error: inconsistent I/O"
|
||||
|
||||
pub struct decoder?(
|
||||
)(
|
||||
// stack is conceptually an array of bits, implemented as an array of u32.
|
||||
@@ -51,7 +53,8 @@ pub struct decoder?(
|
||||
)
|
||||
|
||||
pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
var number_length : base.u32[..= 50]
|
||||
var number_length : base.u32[..= 0x3FF]
|
||||
var number_status : base.u32[..= 0x3]
|
||||
var string_length : base.u32[..= 0xFFFE]
|
||||
var whitespace_length : base.u32[..= 0xFFFE]
|
||||
var depth : base.u32[..= 1024]
|
||||
@@ -249,21 +252,33 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
pre args.dst.available() > 0,
|
||||
{
|
||||
number_length = this.decode_number!(src: args.src)
|
||||
if number_length > 1 {
|
||||
number_length -= 1
|
||||
number_status = number_length >> 8
|
||||
number_length = number_length & 0xFF
|
||||
if number_status == 0 {
|
||||
args.dst.write_fast_token!(value: 0x40_0002, length: number_length as base.u64)
|
||||
break
|
||||
} else if number_length < 1 {
|
||||
return "#unsupported number length"
|
||||
}
|
||||
if args.src.is_closed() {
|
||||
|
||||
while number_length > 0 {
|
||||
number_length -= 1
|
||||
if args.src.can_undo_byte() {
|
||||
args.src.undo_byte!()
|
||||
} else {
|
||||
return "#internal error: inconsistent I/O"
|
||||
}
|
||||
}
|
||||
|
||||
if number_status == 1 {
|
||||
return "#bad input"
|
||||
}
|
||||
yield? base."$short read"
|
||||
while args.dst.available() <= 0,
|
||||
post args.dst.available() > 0,
|
||||
{
|
||||
yield? base."$short write"
|
||||
} else if number_status == 2 {
|
||||
return "#unsupported number length"
|
||||
} else {
|
||||
yield? base."$short read"
|
||||
while args.dst.available() <= 0,
|
||||
post args.dst.available() > 0,
|
||||
{
|
||||
yield? base."$short write"
|
||||
}
|
||||
}
|
||||
}
|
||||
// -------- END parse numbers.
|
||||
@@ -380,9 +395,9 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
}
|
||||
}
|
||||
|
||||
pri func decoder.decode_number!(src: base.io_reader) base.u32[..= 50] {
|
||||
pri func decoder.decode_number!(src: base.io_reader) base.u32[..= 0x3FF] {
|
||||
var c : base.u8
|
||||
var n : base.u32[..= 49]
|
||||
var n : base.u32[..= 0x3FF]
|
||||
|
||||
// TODO: fractions, exponents, leading '-' sign, special casing when the
|
||||
// first digit is '0'.
|
||||
@@ -390,25 +405,21 @@ pri func decoder.decode_number!(src: base.io_reader) base.u32[..= 50] {
|
||||
n = 0
|
||||
while true {
|
||||
if args.src.available() <= 0 {
|
||||
if args.src.is_closed() {
|
||||
return n + 1
|
||||
if not args.src.is_closed() {
|
||||
n |= 0x300
|
||||
}
|
||||
break
|
||||
}
|
||||
c = args.src.peek_u8()
|
||||
if (c < 0x30) or (0x39 < c) {
|
||||
return n + 1
|
||||
break
|
||||
}
|
||||
if n >= 49 {
|
||||
return 0
|
||||
n |= 0x200
|
||||
break
|
||||
}
|
||||
n += 1
|
||||
args.src.skip32_fast!(actual: 1, worst_case: 1)
|
||||
}
|
||||
|
||||
while (n > 0) and args.src.can_undo_byte() {
|
||||
n -= 1
|
||||
args.src.undo_byte!()
|
||||
}
|
||||
return 1
|
||||
return n
|
||||
}
|
||||
Reference in new issue
Block a user