erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-13 04:09:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

fix(common/core):in sequences with CODE_xxx checked for p<pstart ; added more tests to decxstr

Browse source
This commit is contained in:
Sabine 2021-10-29 09:55:25 +02:00
parent 8670495c6e
commit f4c6654eb5
2 changed files with 100 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/core/desktop/src/kmx/kmx_xstring.cpp
View file

@ -179,10 +179,9 @@ PKMX_WCHAR km::kbp::kmx::decxstr(PKMX_WCHAR p, PKMX_WCHAR pStart)
{
for (int i = 1; i < 5; i++)
{
// *(p - i) == UC_SENTINEL && next CODE_ right to UC_SENTINEL ( looked up in CODE__SIZE+1) has value i
if ((*(p - i) == UC_SENTINEL) && (CODE__SIZE[*(p - i + 1)] + 1 == i)) {
// p right of pstart && *(p - i) == UC_SENTINEL && next CODE_ right of UC_SENTINEL ( looked up in CODE__SIZE+1) has value i
if ((p >= pStart + i) && (*(p - i) == UC_SENTINEL) && (CODE__SIZE[*(p - i + 1)] + 1 == i))
return (p - (CODE__SIZE[*(p - i + 1)] + 1));
}
}
}
return p;

101
common/core/desktop/tests/unit/kmnkbd/test_kmx_xstring.cpp
View file

@ -30,7 +30,102 @@ void test_decxstr() {
PKMX_WCHAR p_start; // pointer start of input
PKMX_WCHAR p; // pointer end of input
PKMX_WCHAR q; // pointer output
// -------------------------------------------------------------------------------------------------------------------------------------------------------
// more tests: check if we might end up left of pstart
// -------------------------------------------------------------------------------------------------------------------------------------------------------
p_start = (PKMX_WCHAR)u"\u0001";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (NULL ));
p_start = (PKMX_WCHAR)u"\u0001\u0001";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 1));
p_start = (PKMX_WCHAR)u"\u0001\u0001\u0001";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 1));
p_start = (PKMX_WCHAR)u"\uFFFF\u0001";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 1));
p_start = (PKMX_WCHAR)u"\uFFFF\u0001\u0001";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 2));
p_start = (PKMX_WCHAR)u"\uFFFF\u0001\u0001\u0001";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 3));
p_start = (PKMX_WCHAR)u"\u0014";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (NULL));
p_start = (PKMX_WCHAR)u"\u0014\u0014";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 1));
p_start = (PKMX_WCHAR)u"\u0014\u0014\u0014";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 1));
p_start = (PKMX_WCHAR)u"\u0014\u0014\u0014\u0014";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 1));
p_start = (PKMX_WCHAR)u"\u0014\u0014\u0014\u0014\u0014";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 1));
p_start = (PKMX_WCHAR)u"\u0014\u0014\u0014\u0014\u0014\u0014";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 1));
p_start = (PKMX_WCHAR)u"\uFFFF\u0014";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 1));
p_start = (PKMX_WCHAR)u"\uFFFF\u0014\u0014";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p-2 ));
p_start = (PKMX_WCHAR)u"\uFFFF\u0014\u0014\u0014";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 1));
p_start = (PKMX_WCHAR)u"\uFFFF\u0014\u0014\u0014\u0014";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 1));
p_start = (PKMX_WCHAR)u"\uFFFF\u0014\u0014\u0014\u0014\u0014";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 5));
p_start = (PKMX_WCHAR)u"\uFFFF\u0014\u0014\u0014\u0014\u0014\u0014";
p = find_ptr_to_last_character(p_start);
q = decxstr(p, p_start);
assert(q == (p - 1));
// -------------------------------------------------------------------------------------------------------------------------------------------------------
// -- differences in pointer movement for new decxstr ----------------------------------------------------------------------------------------------------
// ----- OLD version of decxstr: 0x0A not used => return ( p - 1) , 0x0C not used => return ( p - 1) , 0x0E = 1 => return ( p - 3)
@ -1218,7 +1313,7 @@ void test_decxstr() {
p = (PKMX_WCHAR)u"\uFFFF\u0004\u0062\U0001F609";
q = incxstr(p);
assert(q == p + 2);
}
}
constexpr const auto help_str = "\
test_kmx_xstring [--color]\n\
@ -1240,4 +1335,4 @@ int main(int argc, char *argv []) {
test_decxstr();
return 0;
}
}