From 7a5e89115df4603efdb8709ce990a5634d92e1fa Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 6 Aug 2020 23:55:03 +1000 Subject: [PATCH] Fix -Werror=conversion in std/json decode_tokens --- release/c/wuffs-unsupported-snapshot.c | 4 ++-- std/json/decode_json.wuffs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index eeccf94d..9e9a3161 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -26180,10 +26180,10 @@ wuffs_json__decoder__decode_tokens( v_backslash_x_ok = 128; v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255 & (v_backslash_x_string >> 16))]; v_backslash_x_ok &= v_c; - v_backslash_x_value = ((v_c & 15) << 4); + v_backslash_x_value = ((uint8_t)(((v_c & 15) << 4))); v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255 & (v_backslash_x_string >> 24))]; v_backslash_x_ok &= v_c; - v_backslash_x_value |= (v_c & 15); + v_backslash_x_value = ((uint8_t)((v_backslash_x_value | (v_c & 15)))); if ((v_backslash_x_ok == 0) || ((v_backslash_x_string & 65535) != 30812)) { status = wuffs_base__make_status(wuffs_json__error__bad_backslash_escape); goto exit; diff --git a/std/json/decode_json.wuffs b/std/json/decode_json.wuffs index 2b770d13..a18c66a0 100644 --- a/std/json/decode_json.wuffs +++ b/std/json/decode_json.wuffs @@ -584,10 +584,10 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor c = LUT_HEXADECIMAL_DIGITS[0xFF & (backslash_x_string >> 16)] backslash_x_ok &= c - backslash_x_value = (c & 0x0F) << 4 + backslash_x_value = ((c & 0x0F) << 4) as base.u8 c = LUT_HEXADECIMAL_DIGITS[0xFF & (backslash_x_string >> 24)] backslash_x_ok &= c - backslash_x_value |= (c & 0x0F) + backslash_x_value = (backslash_x_value | (c & 0x0F)) as base.u8 if (backslash_x_ok == 0) or ((backslash_x_string & 0xFFFF) <> 0x785C) {