diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 58b7011f..933982d3 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -16592,16 +16592,11 @@ wuffs_cbor__decoder__decode_tokens( (((uint64_t)(4194560)) << 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_minor < 24) { - *iop_a_dst++ = wuffs_base__make_token( - (((uint64_t)(4194560)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | - (((uint64_t)(1)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); } else if (v_c_minor < 28) { *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194560)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | - (((uint64_t)((1 + (((uint32_t)(1)) << (v_c_minor & 3))))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); + (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); } else if (v_c_minor == 31) { v_indefinite_string_major_type = 2; *iop_a_dst++ = wuffs_base__make_token( @@ -16659,16 +16654,11 @@ wuffs_cbor__decoder__decode_tokens( (((uint64_t)(4194579)) << 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_minor < 24) { - *iop_a_dst++ = wuffs_base__make_token( - (((uint64_t)(4194579)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | - (((uint64_t)(1)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); } else if (v_c_minor < 28) { *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194579)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | - (((uint64_t)((1 + (((uint32_t)(1)) << (v_c_minor & 3))))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); + (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); } else if (v_c_minor == 31) { v_indefinite_string_major_type = 3; *iop_a_dst++ = wuffs_base__make_token( diff --git a/std/cbor/decode_cbor.wuffs b/std/cbor/decode_cbor.wuffs index f0aeb888..7601d504 100644 --- a/std/cbor/decode_cbor.wuffs +++ b/std/cbor/decode_cbor.wuffs @@ -240,20 +240,13 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor continued: 0, length: 1) break.goto_parsed_a_leaf_value - } else if c_minor < 0x18 { - args.dst.write_simple_token_fast!( - value_major: 0, - value_minor: (base.TOKEN__VBC__STRING << 21) | - base.TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP, - continued: 1, - length: 1) } else if c_minor < 0x1C { args.dst.write_simple_token_fast!( value_major: 0, value_minor: (base.TOKEN__VBC__STRING << 21) | base.TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP, continued: 1, - length: 1 + ((1 as base.u32) << (c_minor & 3))) + length: TOKEN_LENGTHS[c_minor] as base.u32) } else if c_minor == 0x1F { indefinite_string_major_type = 2 args.dst.write_simple_token_fast!( @@ -320,16 +313,6 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor continued: 0, length: 1) break.goto_parsed_a_leaf_value - } else if c_minor < 0x18 { - args.dst.write_simple_token_fast!( - value_major: 0, - value_minor: (base.TOKEN__VBC__STRING << 21) | - base.TOKEN__VBD__STRING__DEFINITELY_UTF_8 | - base.TOKEN__VBD__STRING__CHAIN_MUST_BE_UTF_8 | - base.TOKEN__VBD__STRING__DEFINITELY_ASCII | - base.TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP, - continued: 1, - length: 1) } else if c_minor < 0x1C { args.dst.write_simple_token_fast!( value_major: 0, @@ -339,7 +322,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor base.TOKEN__VBD__STRING__DEFINITELY_ASCII | base.TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP, continued: 1, - length: 1 + ((1 as base.u32) << (c_minor & 3))) + length: TOKEN_LENGTHS[c_minor] as base.u32) } else if c_minor == 0x1F { indefinite_string_major_type = 3 args.dst.write_simple_token_fast!(