Have std/json decode numbers

This commit is contained in:
Nigel Tao committed 2020-02-19 12:25:00 +11:00
1 parent a8406927ef
commit 8850d38403
3 files changed
+163 -1

No files matched your search

+64 -1
View File
@@ -15,8 +15,11 @@
// TODO: "decoder implements base.token_decoder".
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.
@@ -50,6 +53,7 @@ pub struct decoder?(
)
pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
var number_length : base.u32[..= 50]
var string_length : base.u32[..= 0xFFFE]
var whitespace_length : base.u32[..= 0xFFFE]
var depth : base.u32[..= 1024]
@@ -235,8 +239,37 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
}
continue.outer
} else if c >= 0x30 { // 0x30 is '0'.
// -------- BEGIN parse numbers.
while true,
pre args.dst.available() > 0,
{
number_length = this.decode_number!(src: args.src)
if number_length > 1 {
number_length -= 1
args.dst.write_fast_token!(value: 0x40_0002, length: number_length as base.u64)
while number_length > 0 {
number_length -= 1
if args.src.available() > 0 {
args.src.skip32_fast!(actual: 1, worst_case: 1)
} else {
return "#internal error: inconsistent I/O"
}
}
break
} else if number_length < 1 {
return "#unsupported number length"
}
yield? base."$short read"
while args.dst.available() <= 0,
post args.dst.available() > 0,
{
yield? base."$short write"
}
}
// -------- END parse numbers.
} else {
// TODO: numbers.
return "#bad input"
}
@@ -347,3 +380,33 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
expect = expect_after_value
}
}
pri func decoder.decode_number!(src: base.io_reader) base.u32[..= 50] {
var c : base.u8
var n : base.u32[..= 49]
// TODO: fractions, exponents, leading '-' sign, special casing when the
// first digit is '0'.
n = 0
while true {
if args.src.available() <= 0 {
if args.src.is_closed() {
return n + 1
}
break
}
c = args.src.peek_u8()
if (c < 0x30) or (0x39 < c) {
return n + 1
}
if n >= 49 {
return 0
}
n += 1
args.src.skip32_fast!(actual: 1, worst_case: 1)
}
// TODO: explicitly undo arg.src reads.
return 1
}