From 9a5b6357788ee0ebec5b682d5b019dae2dc31e63 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 20 Feb 2020 22:25:04 +1100 Subject: [PATCH] Have std/json distinguish int/float numbers --- release/c/wuffs-unsupported-snapshot.c | 15 ++++++++++++--- std/json/decode_json.wuffs | 18 +++++++++++++----- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index f13cf44c..f02f0c6f 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -18500,6 +18500,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, self->private_impl.active_coroutine = 0; wuffs_base__status status = wuffs_base__make_status(NULL); + uint64_t v_token_value = 0; uint32_t v_number_length = 0; uint32_t v_number_status = 0; uint32_t v_string_length = 0; @@ -18731,10 +18732,15 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, iop_a_src = a_src->data.ptr + a_src->meta.ri; } v_number_status = (v_number_length >> 8); - v_number_length = (v_number_length & 255); + v_token_value = 4194306; + if ((v_number_length & 128) != 0) { + v_token_value = 4194308; + } + v_number_length = (v_number_length & 127); if (v_number_status == 0) { *iop_a_dst++ = wuffs_base__make_token( - (((uint64_t)(4194306)) << WUFFS_BASE__TOKEN__VALUE__SHIFT) | + (((uint64_t)(v_token_value)) + << WUFFS_BASE__TOKEN__VALUE__SHIFT) | (((uint64_t)(((uint64_t)(v_number_length)))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label_4_break; @@ -18937,6 +18943,7 @@ wuffs_json__decoder__decode_number(wuffs_json__decoder* self, wuffs_base__io_buffer* a_src) { uint8_t v_c = 0; uint32_t v_n = 0; + uint32_t v_floating_point = 0; uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; @@ -18995,6 +19002,7 @@ wuffs_json__decoder__decode_number(wuffs_json__decoder* self, v_c = wuffs_base__load_u8be(iop_a_src); if (v_c != 46) { } else { + v_floating_point = 128; v_n += 1; (iop_a_src += 1, wuffs_base__make_empty_struct()); if (a_src) { @@ -19018,6 +19026,7 @@ wuffs_json__decoder__decode_number(wuffs_json__decoder* self, if ((v_c != 69) && (v_c != 101)) { goto label_0_break; } + v_floating_point = 128; v_n += 1; (iop_a_src += 1, wuffs_base__make_empty_struct()); if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) { @@ -19046,7 +19055,7 @@ label_0_break:; if (a_src) { a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); } - return v_n; + return (v_n | v_floating_point); } // -------- func json.decoder.decode_digits diff --git a/std/json/decode_json.wuffs b/std/json/decode_json.wuffs index effd2e17..bbcb73df 100644 --- a/std/json/decode_json.wuffs +++ b/std/json/decode_json.wuffs @@ -53,6 +53,7 @@ pub struct decoder?( ) pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) { + var token_value : base.u64[..= 0xFF_FFFF] var number_length : base.u32[..= 0x3FF] var number_status : base.u32[..= 0x3] var string_length : base.u32[..= 0xFFFE] @@ -256,9 +257,13 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) { { number_length = this.decode_number!(src: args.src) number_status = number_length >> 8 - number_length = number_length & 0xFF + token_value = 0x40_0002 + if (number_length & 0x80) <> 0 { + token_value = 0x40_0004 + } + number_length = number_length & 0x7F if number_status == 0 { - args.dst.write_fast_token!(value: 0x40_0002, length: number_length as base.u64) + args.dst.write_fast_token!(value: token_value, length: number_length as base.u64) break } @@ -399,8 +404,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[..= 0x3FF] { - var c : base.u8 - var n : base.u32[..= 0x3FF] + var c : base.u8 + var n : base.u32[..= 0x3FF] + var floating_point : base.u32[..= 0x80] while.goto_done true { n = 0 @@ -463,6 +469,7 @@ pri func decoder.decode_number!(src: base.io_reader) base.u32[..= 0x3FF] { assert args.src.available() > 0 assert n <= 0xFD } else { + floating_point = 0x80 n += 1 args.src.skip32_fast!(actual: 1, worst_case: 1) @@ -488,6 +495,7 @@ pri func decoder.decode_number!(src: base.io_reader) base.u32[..= 0x3FF] { if (c <> 0x45) and (c <> 0x65) { // 0x45 and 0x65 are 'E' and 'e'. break.goto_done } + floating_point = 0x80 n += 1 args.src.skip32_fast!(actual: 1, worst_case: 1) assert n <= 0xFE @@ -516,7 +524,7 @@ pri func decoder.decode_number!(src: base.io_reader) base.u32[..= 0x3FF] { break.goto_done } // while.goto_done - return n + return n | floating_point } pri func decoder.decode_digits!(src: base.io_reader, n: base.u32[..= 0xFF]) base.u32[..= 0x3FF] {