Rename some std/json variables

This commit is contained in:
Nigel Tao committed 2020-03-24 14:02:08 +11:00
1 parent 93882564fd
commit 2ca0ef7bd5
2 files changed
+30 -30

No files matched your search

+15 -15
View File
@@ -20549,7 +20549,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self,
uint32_t v_stack_byte = 0;
uint32_t v_stack_bit = 0;
uint32_t v_match = 0;
uint32_t v_c_by_4 = 0;
uint32_t v_c4 = 0;
uint8_t v_c = 0;
uint8_t v_backslash = 0;
uint8_t v_char = 0;
@@ -20728,11 +20728,11 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self,
goto label__string_loop_outer__continue;
}
while (((uint64_t)(io2_a_src - iop_a_src)) > 4) {
v_c_by_4 = wuffs_base__load_u32le__no_bounds_check(iop_a_src);
if (0 != (wuffs_json__lut_chars[(255 & (v_c_by_4 >> 0))] |
wuffs_json__lut_chars[(255 & (v_c_by_4 >> 8))] |
wuffs_json__lut_chars[(255 & (v_c_by_4 >> 16))] |
wuffs_json__lut_chars[(255 & (v_c_by_4 >> 24))])) {
v_c4 = wuffs_base__load_u32le__no_bounds_check(iop_a_src);
if (0 != (wuffs_json__lut_chars[(255 & (v_c4 >> 0))] |
wuffs_json__lut_chars[(255 & (v_c4 >> 8))] |
wuffs_json__lut_chars[(255 & (v_c4 >> 16))] |
wuffs_json__lut_chars[(255 & (v_c4 >> 24))])) {
goto label__0__break;
}
(iop_a_src += 4, wuffs_base__make_empty_struct());
@@ -22015,8 +22015,8 @@ wuffs_json__decoder__decode_comment(wuffs_json__decoder* self,
wuffs_base__io_buffer* a_src) {
wuffs_base__status status = wuffs_base__make_status(NULL);
uint8_t v_c8 = 0;
uint16_t v_c16 = 0;
uint8_t v_c = 0;
uint16_t v_c2 = 0;
uint32_t v_link_prev = 0;
uint32_t v_length = 0;
@@ -22066,8 +22066,8 @@ wuffs_json__decoder__decode_comment(wuffs_json__decoder* self,
status = wuffs_base__make_status(wuffs_base__suspension__short_read);
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
}
v_c16 = wuffs_base__load_u16le__no_bounds_check(iop_a_src);
if ((v_c16 == 10799) &&
v_c2 = wuffs_base__load_u16le__no_bounds_check(iop_a_src);
if ((v_c2 == 10799) &&
self->private_impl.f_quirk_enabled_allow_comment_block) {
(iop_a_src += 2, wuffs_base__make_empty_struct());
v_length = 2;
@@ -22099,8 +22099,8 @@ wuffs_json__decoder__decode_comment(wuffs_json__decoder* self,
v_length = 0;
goto label__comment_block__continue;
}
v_c16 = wuffs_base__load_u16le__no_bounds_check(iop_a_src);
if (v_c16 == 12074) {
v_c2 = wuffs_base__load_u16le__no_bounds_check(iop_a_src);
if (v_c2 == 12074) {
(iop_a_src += 2, wuffs_base__make_empty_struct());
*iop_a_dst++ = wuffs_base__make_token(
(((uint64_t)(2)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
@@ -22125,7 +22125,7 @@ wuffs_json__decoder__decode_comment(wuffs_json__decoder* self,
v_length += 1;
}
}
} else if ((v_c16 == 12079) &&
} else if ((v_c2 == 12079) &&
self->private_impl.f_quirk_enabled_allow_comment_line) {
(iop_a_src += 2, wuffs_base__make_empty_struct());
v_length = 2;
@@ -22157,8 +22157,8 @@ wuffs_json__decoder__decode_comment(wuffs_json__decoder* self,
v_length = 0;
goto label__comment_line__continue;
}
v_c8 = wuffs_base__load_u8be__no_bounds_check(iop_a_src);
if (v_c8 == 10) {
v_c = wuffs_base__load_u8be__no_bounds_check(iop_a_src);
if (v_c == 10) {
(iop_a_src += 1, wuffs_base__make_empty_struct());
*iop_a_dst++ = wuffs_base__make_token(
(((uint64_t)(1)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
+15 -15
View File
@@ -110,7 +110,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
var stack_byte : base.u32[..= (1024 / 32) - 1]
var stack_bit : base.u32[..= 31]
var match : base.u32[..= 2]
var c_by_4 : base.u32
var c4 : base.u32
var c : base.u8
var backslash : base.u8
var char : base.u8
@@ -268,11 +268,11 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
inv args.dst.available() > 0,
inv args.src.available() > 0,
{
c_by_4 = args.src.peek_u32le()
if 0x00 <> (lut_chars[0xFF & (c_by_4 >> 0)] |
lut_chars[0xFF & (c_by_4 >> 8)] |
lut_chars[0xFF & (c_by_4 >> 16)] |
lut_chars[0xFF & (c_by_4 >> 24)]) {
c4 = args.src.peek_u32le()
if 0x00 <> (lut_chars[0xFF & (c4 >> 0)] |
lut_chars[0xFF & (c4 >> 8)] |
lut_chars[0xFF & (c4 >> 16)] |
lut_chars[0xFF & (c4 >> 24)]) {
break
}
args.src.skip32_fast!(actual: 4, worst_case: 4)
@@ -1334,8 +1334,8 @@ pri func decoder.decode_leading?(dst: base.token_writer, src: base.io_reader) {
}
pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) {
var c8 : base.u8
var c16 : base.u16
var c : base.u8
var c2 : base.u16
var link_prev : base.u32[..= 0x2]
var length : base.u32[..= 0xFFFD]
@@ -1352,9 +1352,9 @@ pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) {
}
yield? base."$short read"
}
c16 = args.src.peek_u16le()
c2 = args.src.peek_u16le()
if (c16 == 0x2A2F) and this.quirk_enabled_allow_comment_block {
if (c2 == 0x2A2F) and this.quirk_enabled_allow_comment_block {
args.src.skip32_fast!(actual: 2, worst_case: 2)
length = 2
@@ -1385,8 +1385,8 @@ pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) {
continue.comment_block
}
c16 = args.src.peek_u16le()
if c16 == 0x2F2A { // 0x2F2A is "*/" little-endian.
c2 = args.src.peek_u16le()
if c2 == 0x2F2A { // 0x2F2A is "*/" little-endian.
args.src.skip32_fast!(actual: 2, worst_case: 2)
args.dst.write_fast_token!(
value_major: 0,
@@ -1411,7 +1411,7 @@ pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) {
}
} endwhile.comment_block
} else if (c16 == 0x2F2F) and this.quirk_enabled_allow_comment_line {
} else if (c2 == 0x2F2F) and this.quirk_enabled_allow_comment_line {
args.src.skip32_fast!(actual: 2, worst_case: 2)
length = 2
@@ -1442,8 +1442,8 @@ pri func decoder.decode_comment?(dst: base.token_writer, src: base.io_reader) {
continue.comment_line
}
c8 = args.src.peek_u8()
if c8 == 0x0A { // 0x0A is '\n'.
c = args.src.peek_u8()
if c == 0x0A { // 0x0A is '\n'.
args.src.skip32_fast!(actual: 1, worst_case: 1)
args.dst.write_fast_token!(
value_major: 0,