Have std/json distinguish int/float numbers

This commit is contained in:
Nigel Tao committed 2020-02-20 22:27:04 +11:00
1 parent 70db96ac6d
commit 9a5b635778
2 files changed
+25 -8

No files matched your search

+13 -5
View File
@@ -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] {