Have std/cbor parse negative integers

This commit is contained in:
Nigel Tao committed 2020-07-16 21:25:14 +10:00
1 parent fca9a36252
commit 664f8431d2
3 files changed
+124 -36

No files matched your search

+68 -35
View File
@@ -911,7 +911,7 @@ write_literal(uint64_t vbd) {
// ----
const char* //
write_number_cbor_f64(double f) {
write_number_as_cbor_f64(double f) {
uint8_t buf[9];
wuffs_base__lossy_value_u16 lv16 =
wuffs_base__ieee_754_bit_representation__from_f64_to_u16_truncate(f);
@@ -934,7 +934,7 @@ write_number_cbor_f64(double f) {
}
const char* //
write_number_cbor_u64(uint8_t base, uint64_t u) {
write_number_as_cbor_u64(uint8_t base, uint64_t u) {
uint8_t buf[9];
if (u < 0x18) {
buf[0] = base | ((uint8_t)u);
@@ -957,6 +957,51 @@ write_number_cbor_u64(uint8_t base, uint64_t u) {
return write_dst(&buf[0], 9);
}
const char* //
write_cbor_number_as_json(uint8_t* ptr,
size_t len,
bool ignore_first_byte,
bool minus_1_minus_x) {
if (ignore_first_byte) {
if (len == 0) {
return "main: internal error: ignore_first_byte with no bytes";
}
ptr++;
len--;
}
uint64_t u;
switch (len) {
case 1:
u = wuffs_base__load_u8__no_bounds_check(ptr);
break;
case 2:
u = wuffs_base__load_u16be__no_bounds_check(ptr);
break;
case 4:
u = wuffs_base__load_u32be__no_bounds_check(ptr);
break;
case 8:
u = wuffs_base__load_u64be__no_bounds_check(ptr);
break;
default:
return "main: internal error: unexpected cbor number byte length";
}
uint8_t buf[1 + WUFFS_BASE__U64__BYTE_LENGTH__MAX_INCL];
uint8_t* b = &buf[0];
if (minus_1_minus_x) {
u++;
if (u == 0) {
// See the cbor.TOKEN_VALUE_MINOR__MINUS_1_MINUS_X comment re overflow.
return write_dst("-18446744073709551616", 21);
}
*b++ = '-';
}
size_t n = wuffs_base__render_number_u64(
wuffs_base__make_slice_u8(b, WUFFS_BASE__U64__BYTE_LENGTH__MAX_INCL), u,
WUFFS_BASE__RENDER_NUMBER_XXX__DEFAULT_OPTIONS);
return write_dst(&buf[0], n + (minus_1_minus_x ? 1 : 0));
}
const char* //
write_number(uint64_t vbd, uint8_t* ptr, size_t len) {
if (g_flags.output_format == file_format::json) {
@@ -966,35 +1011,10 @@ write_number(uint64_t vbd, uint8_t* ptr, size_t len) {
WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_INTEGER_UNSIGNED) &&
(vbd &
WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_BINARY_BIG_ENDIAN)) {
if (vbd & WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_IGNORE_FIRST_BYTE) {
if (len == 0) {
goto fail;
}
ptr++;
len--;
}
uint64_t u;
switch (len) {
case 1:
u = wuffs_base__load_u8__no_bounds_check(ptr);
break;
case 2:
u = wuffs_base__load_u16be__no_bounds_check(ptr);
break;
case 4:
u = wuffs_base__load_u32be__no_bounds_check(ptr);
break;
case 8:
u = wuffs_base__load_u64be__no_bounds_check(ptr);
break;
default:
goto fail;
}
uint8_t buf[WUFFS_BASE__U64__BYTE_LENGTH__MAX_INCL];
size_t n = wuffs_base__render_number_u64(
wuffs_base__make_slice_u8(&buf[0], sizeof buf), u,
WUFFS_BASE__RENDER_NUMBER_XXX__DEFAULT_OPTIONS);
return write_dst(&buf[0], n);
return write_cbor_number_as_json(
ptr, len,
vbd & WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_IGNORE_FIRST_BYTE,
false);
}
// From here on, (g_flags.output_format == file_format::cbor).
@@ -1010,14 +1030,14 @@ write_number(uint64_t vbd, uint8_t* ptr, size_t len) {
wuffs_base__make_slice_u8(ptr, len),
WUFFS_BASE__PARSE_NUMBER_XXX__DEFAULT_OPTIONS);
if (ri.status.is_ok()) {
return write_number_cbor_u64(0x20, ~ri.value);
return write_number_as_cbor_u64(0x20, ~ri.value);
}
} else {
wuffs_base__result_u64 ru = wuffs_base__parse_number_u64(
wuffs_base__make_slice_u8(ptr, len),
WUFFS_BASE__PARSE_NUMBER_XXX__DEFAULT_OPTIONS);
if (ru.status.is_ok()) {
return write_number_cbor_u64(0x00, ru.value);
return write_number_as_cbor_u64(0x00, ru.value);
}
}
}
@@ -1027,7 +1047,7 @@ write_number(uint64_t vbd, uint8_t* ptr, size_t len) {
wuffs_base__make_slice_u8(ptr, len),
WUFFS_BASE__PARSE_NUMBER_XXX__DEFAULT_OPTIONS);
if (rf.status.is_ok()) {
return write_number_cbor_f64(rf.value);
return write_number_as_cbor_f64(rf.value);
}
}
}
@@ -1412,7 +1432,20 @@ handle_token(wuffs_base__token t, bool start_of_token_chain) {
goto after_value;
}
// Return an error if we didn't match the (vbc, vbd) pair.
if (t.value_major() == WUFFS_CBOR__TOKEN_VALUE_MAJOR) {
uint64_t value_minor = t.value_minor();
if (value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__TAG) {
// TODO: CBOR tags.
} else if (value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__MINUS_1_MINUS_X) {
TRY(write_cbor_number_as_json(
g_src.data.ptr + g_curr_token_end_src_index - len, len, true,
true));
goto after_value;
}
}
// Return an error if we didn't match the (value_major, value_minor) or
// (vbc, vbd) pair.
return "main: internal error: unexpected token";
} while (0);
+20
View File
@@ -5520,6 +5520,12 @@ extern const char wuffs_cbor__error__bad_input[];
// ---------------- Public Consts
#define WUFFS_CBOR__TOKEN_VALUE_MAJOR 787997
#define WUFFS_CBOR__TOKEN_VALUE_MINOR__TAG 1
#define WUFFS_CBOR__TOKEN_VALUE_MINOR__MINUS_1_MINUS_X 2
// ---------------- Struct Declarations
typedef struct wuffs_cbor__decoder__struct wuffs_cbor__decoder;
@@ -16449,6 +16455,20 @@ wuffs_cbor__decoder__decode_tokens(
(((uint64_t)((1 + (((uint32_t)(1)) << (v_c - 24))))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
goto label__goto_parsed_a_leaf_value__break;
}
} else if (v_c < 64) {
v_c &= 31;
if (v_c < 24) {
*iop_a_dst++ = wuffs_base__make_token(
(((uint64_t)((12582912 | (2097151 - ((uint32_t)(v_c)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
(((uint64_t)(1)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
goto label__goto_parsed_a_leaf_value__break;
} else if (v_c < 28) {
*iop_a_dst++ = wuffs_base__make_token(
(((uint64_t)(787997)) << WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT) |
(((uint64_t)(2)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
(((uint64_t)((1 + (((uint32_t)(1)) << (v_c - 24))))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
goto label__goto_parsed_a_leaf_value__break;
}
}
if (iop_a_src > io1_a_src) {
(iop_a_src--, wuffs_base__make_empty_struct());
+36 -1
View File
@@ -16,6 +16,22 @@ pub status "#bad input"
pri status "#internal error: inconsistent I/O"
// TOKEN_VALUE_MAJOR is the base-38 encoding of "cbor".
pub const TOKEN_VALUE_MAJOR : base.u32 = 0x0C_061D
// TOKEN_VALUE_MINOR__TAG means that the remaining 24 bits of the token's
// value_minor is a CBOR tag. That token may be continued, in which case the
// following token is an extended token (46 bits) and the overall 64-bit CBOR
// tag is ((first << 46) | ext).
pub const TOKEN_VALUE_MINOR__TAG : base.u32 = 0x01
// TOKEN_VALUE_MINOR__MINUS_1_MINUS_X means that the token's final
// (token.length - 1) bytes (which must be one of 1, 2, 4 or 8 bytes) contains
// a big-endian unsigned integer x. The token's overall value is the negative
// number (-1 - x). Note that this value can underflow an int64_t, and its
// absolute value (+1 + x) can overflow a uint64_t.
pub const TOKEN_VALUE_MINOR__MINUS_1_MINUS_X : base.u32 = 0x02
pub struct decoder? implements base.token_decoder(
end_of_data : base.bool,
@@ -68,7 +84,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
}
if c < 0x20 {
if c < 0x20 { // Major type 0: an unsigned integer.
c &= 0x1F
if c < 0x18 {
args.dst.write_simple_token_fast!(
@@ -89,6 +105,25 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor
length: 1 + ((1 as base.u32) << (c - 0x18)))
break.goto_parsed_a_leaf_value
}
} else if c < 0x40 { // Major type 1: a negative integer.
c &= 0x1F
if c < 0x18 {
args.dst.write_simple_token_fast!(
value_major: 0,
value_minor: (base.TOKEN__VBC__INLINE_INTEGER << 21) |
(0x1F_FFFF - (c as base.u32)),
continued: 0,
length: 1)
break.goto_parsed_a_leaf_value
} else if c < 0x1C {
args.dst.write_simple_token_fast!(
value_major: TOKEN_VALUE_MAJOR,
value_minor: TOKEN_VALUE_MINOR__MINUS_1_MINUS_X,
continued: 0,
length: 1 + ((1 as base.u32) << (c - 0x18)))
break.goto_parsed_a_leaf_value
}
}
if args.src.can_undo_byte() {