UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher/text_field] Fix handling of \n

Browse Source 
The buffer length did not take into account the \n removal. In fact, we
could just remove the \n while also removing the empty code points,
which is what we do now.
This commit is contained in:
Léa Saviot
2020-01-30 16:31:58 +01:00
parent 4b996b333b
commit ae3fa46191
4 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
ion/test/utf8_helper.cpp
View File

@@ -45,10 +45,10 @@ QUIZ_CASE(ion_utf8_helper_not_code_point_search) {
assert_not_code_point_searched_is(s, UCodePointGreekSmallLetterPi, true, s+5, s+2);
}
void assert_copy_and_remove_code_point_gives(char * dst, size_t dstSize, const char * src, CodePoint c, const char * result) {
void assert_copy_and_remove_code_points_gives(char * dst, size_t dstSize, const char * src, CodePoint * c, int numberOfCodePoints, const char * result) {
size_t resultLen = strlen(result);
quiz_assert(dstSize >= resultLen + 1);
UTF8Helper::CopyAndRemoveCodePoint(dst, dstSize, src, c);
UTF8Helper::CopyAndRemoveCodePoints(dst, dstSize, src, c, numberOfCodePoints);
for (size_t i = 0; i <= resultLen; i++) {
quiz_assert(dst[i] == result[i]);
}
@@ -59,49 +59,54 @@ QUIZ_CASE(ion_utf8_copy_and_remove_code_point) {
char buffer[bufferSize];
const char * s = "12345";
CodePoint c = '1';
CodePoint c1[] = {'1'};
const char * result = "2345";
assert_copy_and_remove_code_point_gives(buffer, bufferSize, s, c, result);
assert_copy_and_remove_code_points_gives(buffer, bufferSize, s, c1, 1, result);
s = "12345";
c = '2';
CodePoint c2[] = {'2'};
result = "1345";
assert_copy_and_remove_code_point_gives(buffer, bufferSize, s, c, result);
assert_copy_and_remove_code_points_gives(buffer, bufferSize, s, c2, 1, result);
s = "2123224252";
c = '2';
CodePoint c3[] = {'2'};
result = "1345";
assert_copy_and_remove_code_point_gives(buffer, bufferSize, s, c, result);
assert_copy_and_remove_code_points_gives(buffer, bufferSize, s, c3, 1, result);
s = "12345";
c = '6';
CodePoint c4[] = {'6'};
result = "12345";
assert_copy_and_remove_code_point_gives(buffer, bufferSize, s, c, result);
assert_copy_and_remove_code_points_gives(buffer, bufferSize, s, c4, 1, result);
s = "12ᴇ4";
c = UCodePointLatinLetterSmallCapitalE;
CodePoint c5[] = {UCodePointLatinLetterSmallCapitalE};
result = "124";
assert_copy_and_remove_code_point_gives(buffer, bufferSize, s, c, result);
assert_copy_and_remove_code_points_gives(buffer, bufferSize, s, c5, 1, result);
s = "12ᴇᴇᴇ4";
c = UCodePointLatinLetterSmallCapitalE;
CodePoint c6[] = {UCodePointLatinLetterSmallCapitalE};
result = "124";
assert_copy_and_remove_code_point_gives(buffer, bufferSize, s, c, result);
assert_copy_and_remove_code_points_gives(buffer, bufferSize, s, c6, 1, result);
// The buffer size is to small to hold s
s = "1234ᴇ";
c = '5';
CodePoint c7[] = {'5'};
result = "1234"; // "1234ᴇ" size is 7
assert_copy_and_remove_code_point_gives(buffer, 6, s, c, result);
assert_copy_and_remove_code_point_gives(buffer, 7, s, c, result);
assert_copy_and_remove_code_points_gives(buffer, 6, s, c7, 1, result);
assert_copy_and_remove_code_points_gives(buffer, 7, s, c7, 1, result);
result = "1234ᴇ";
assert_copy_and_remove_code_point_gives(buffer, 8, s, c, result);
assert_copy_and_remove_code_points_gives(buffer, 8, s, c7, 1, result);
s = "1234ᴇ";
c = '4';
CodePoint c8[] = {'4'};
result = "123ᴇ";
assert_copy_and_remove_code_point_gives(buffer, 7, s, c, result);
assert_copy_and_remove_code_points_gives(buffer, 7, s, c8, 1, result);
// Remove several code points
s = "1234ᴇ3";
CodePoint c9[] = {'4', UCodePointLatinLetterSmallCapitalE};
result = "1233";
assert_copy_and_remove_code_points_gives(buffer, bufferSize, s, c9, 2, result);
}
void assert_remove_code_point_gives(char * buffer, CodePoint c, const char * * indexToUpdate, const char * stoppingPosition, const char * indexToUpdateResult, const char * result) {