From 5a616b66937c2ae5fd40e87e3b4d4da72f8356de Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 24 Jul 2020 23:54:52 +1000 Subject: [PATCH] Have std/cbor parse floating point numbers --- example/jsonptr/jsonptr.cc | 46 ++++++++++++++++++++++++++ release/c/wuffs-unsupported-snapshot.c | 5 +++ std/cbor/decode_cbor.wuffs | 11 ++++++ 3 files changed, 62 insertions(+) diff --git a/example/jsonptr/jsonptr.cc b/example/jsonptr/jsonptr.cc index e153c5eb..beac1461 100644 --- a/example/jsonptr/jsonptr.cc +++ b/example/jsonptr/jsonptr.cc @@ -1020,6 +1020,46 @@ write_number_as_cbor_u64(uint8_t base, uint64_t u) { return write_dst(&buf[0], 9); } +const char* // +write_number_as_json_f64(uint8_t* ptr, size_t len) { + double f; + switch (len) { + case 3: + f = wuffs_base__ieee_754_bit_representation__from_u16_to_f64( + wuffs_base__load_u16be__no_bounds_check(ptr + 1)); + break; + case 5: + f = wuffs_base__ieee_754_bit_representation__from_u32_to_f64( + wuffs_base__load_u32be__no_bounds_check(ptr + 1)); + break; + case 9: + f = wuffs_base__ieee_754_bit_representation__from_u64_to_f64( + wuffs_base__load_u64be__no_bounds_check(ptr + 1)); + break; + default: + return "main: internal error: unexpected write_number_as_json_f64 len"; + } + uint8_t buf[512]; + const uint32_t precision = 0; + size_t n = wuffs_base__render_number_f64( + wuffs_base__make_slice_u8(&buf[0], sizeof buf), f, precision, + WUFFS_BASE__RENDER_NUMBER_FXX__JUST_ENOUGH_PRECISION); + + // JSON numbers don't include Infinities or NaNs. For such numbers, their + // IEEE 754 bit representation's 11 exponent bits are all on. + uint64_t u = wuffs_base__ieee_754_bit_representation__from_f64_to_u64(f); + if (((u >> 52) & 0x7FF) == 0x7FF) { + if (g_flags.output_cbor_metadata_as_json_comments) { + TRY(write_dst("/*cbor:", 7)); + TRY(write_dst(&buf[0], n)); + TRY(write_dst("*/", 2)); + } + return write_dst("null", 4); + } + + return write_dst(&buf[0], n); +} + const char* // write_cbor_minus_1_minus_x(uint8_t* ptr, size_t len) { if (g_flags.output_format == file_format::cbor) { @@ -1084,8 +1124,14 @@ write_cbor_tag(uint64_t tag, uint8_t* ptr, size_t len) { const char* // write_number(uint64_t vbd, uint8_t* ptr, size_t len) { if (g_flags.output_format == file_format::json) { + const uint64_t cfp_fbbe_fifb = + WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_FLOATING_POINT | + WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_BINARY_BIG_ENDIAN | + WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_IGNORE_FIRST_BYTE; if (g_flags.input_format == file_format::json) { return write_dst(ptr, len); + } else if ((vbd & cfp_fbbe_fifb) == cfp_fbbe_fifb) { + return write_number_as_json_f64(ptr, len); } // From here on, (g_flags.output_format == file_format::cbor). diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index d76bac70..9b9c9e1d 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -16843,6 +16843,11 @@ wuffs_cbor__decoder__decode_tokens( (((uint64_t)((8388608 | ((uint32_t)((v_string_length & 255)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | (((uint64_t)(2)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label__goto_parsed_a_leaf_value__break; + } else if (v_c_minor < 28) { + *iop_a_dst++ = wuffs_base__make_token( + (((uint64_t)(10490113)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | + (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); + goto label__goto_parsed_a_leaf_value__break; } else if (v_c_minor == 31) { if (v_depth <= 0) { goto label__goto_fail__break; diff --git a/std/cbor/decode_cbor.wuffs b/std/cbor/decode_cbor.wuffs index ccb0ecea..1fdf3ffb 100644 --- a/std/cbor/decode_cbor.wuffs +++ b/std/cbor/decode_cbor.wuffs @@ -605,6 +605,17 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor length: 2) break.goto_parsed_a_leaf_value + } else if c_minor < 0x1C { + args.dst.write_simple_token_fast!( + value_major: 0, + value_minor: (base.TOKEN__VBC__NUMBER << 21) | + base.TOKEN__VBD__NUMBER__CONTENT_FLOATING_POINT | + base.TOKEN__VBD__NUMBER__FORMAT_BINARY_BIG_ENDIAN | + base.TOKEN__VBD__NUMBER__FORMAT_IGNORE_FIRST_BYTE, + continued: 0, + length: TOKEN_LENGTHS[c_minor] as base.u32) + break.goto_parsed_a_leaf_value + } else if c_minor == 0x1F { // Indefinite-length strings were dealt with separately, above. // Here, we expect to be in an indefinite-length container.