Bruce/tomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Add version check for uc_is_property_prepended_concatenation_mark(),

Browse Source 
which was instroduced in libunistring v1.2
This commit is contained in:
Bruce Hill 2025-03-21 16:30:18 -04:00
parent ac3a02b80b
commit e599a5de39
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stdlib/text.c
View File

@ -61,11 +61,12 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/param.h> #include <sys/param.h>
#include <unistr.h>
#include <unicase.h> #include <unicase.h>
#include <unictype.h> #include <unictype.h>
#include <unigbrk.h> #include <unigbrk.h>
#include <uniname.h> #include <uniname.h>
#include <unistr.h>
#include <unistring/version.h>
#include <uniwidth.h> #include <uniwidth.h>
#include "arrays.h" #include "arrays.h"
@ -206,8 +207,12 @@ public int32_t get_synthetic_grapheme(const ucs4_t *codepoints, int64_t utf32_le
// that begin with *prefix* modifiers, so we gotta check for that case: // that begin with *prefix* modifiers, so we gotta check for that case:
synthetic_graphemes[-grapheme_id-1].main_codepoint = length_prefixed[1]; synthetic_graphemes[-grapheme_id-1].main_codepoint = length_prefixed[1];
for (ucs4_t i = 0; i < utf32_len; i++) { for (ucs4_t i = 0; i < utf32_len; i++) {
#if _LIBUNISTRING_VERSION >= 0x010200
// libuinstring version 1.2.0 introduced uc_is_property_prepended_concatenation_mark()
// It's not critical, but it's technically more correct to have this check:
if (unlikely(uc_is_property_prepended_concatenation_mark(length_prefixed[1+i]))) if (unlikely(uc_is_property_prepended_concatenation_mark(length_prefixed[1+i])))
continue; continue;
#endif
synthetic_graphemes[-grapheme_id-1].main_codepoint = length_prefixed[1+i]; synthetic_graphemes[-grapheme_id-1].main_codepoint = length_prefixed[1+i];
break; break;
} }