diff --git a/kitty/simd-string.c b/kitty/simd-string.c index 873d5dc83..41240134e 100644 --- a/kitty/simd-string.c +++ b/kitty/simd-string.c @@ -139,14 +139,14 @@ init_simd(void *x) { if (has_avx2) { A(has_avx2, True); find_either_of_two_bytes_impl = find_either_of_two_bytes_256; - /* utf8_decode_to_esc_impl = utf8_decode_to_esc_256; */ + utf8_decode_to_esc_impl = utf8_decode_to_esc_256; } else { A(has_avx2, False); } if (has_sse4_2) { A(has_sse4_2, True); if (find_either_of_two_bytes_impl == find_either_of_two_bytes_scalar) find_either_of_two_bytes_impl = find_either_of_two_bytes_128; - /* if (utf8_decode_to_esc_impl == utf8_decode_to_esc_scalar) utf8_decode_to_esc_impl = utf8_decode_to_esc_128; */ + if (utf8_decode_to_esc_impl == utf8_decode_to_esc_scalar) utf8_decode_to_esc_impl = utf8_decode_to_esc_128; } else { A(has_sse4_2, False); } diff --git a/kitty_tests/parser.py b/kitty_tests/parser.py index a33e01d7a..af9cf3431 100644 --- a/kitty_tests/parser.py +++ b/kitty_tests/parser.py @@ -220,8 +220,6 @@ class TestParser(BaseTest): x('abcd1234efgh5678') x('abc\x1bd1234efgh5678') x('abcd1234efgh5678ijklABCDmnopEFGH') - x('ニチ') - x('\x84\x85') for which in (2, 3): x = partial(t, which=which) @@ -235,15 +233,17 @@ class TestParser(BaseTest): x(b'abcd\xe2', b'\x89\xa41234') x(b'abcd\xe2\x89', b'\xa41234') - def test_invalid(src, expected, which=2): + def test_expected(src, expected, which=2): reset_state() _, actual = test_utf8_decode_to_sentinel(b'filler' + asbytes(src), which) expected = 'filler' + expected self.ae(expected, actual, f'Failed for: {src!r} with {which=}') - # various invalid input for which in (1, 2, 3): - pb = partial(test_invalid, which=which) + pb = partial(test_expected, which=which) + pb('ニチ', 'ニチ') + pb('\x84\x85', '\x84\x85') + # various invalid input pb(b'abcd\xf51234', 'abcd\ufffd1234') # bytes > 0xf4 pb(b'abcd\xff1234', 'abcd\ufffd1234') # bytes > 0xf4 pb(b'"\xbf"', '"\ufffd"')