From 91b2b6c65d544f39c45498ebafbab84b81d465b5 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 18 Sep 2018 14:16:06 +0200 Subject: Upgrade PCRE2 to 10.32 (cherry picked from commit d918e0776b5168aed2707b0ca500589844f0faa8) --- ext/pcre/pcre2lib/pcre2_extuni.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/pcre/pcre2lib/pcre2_extuni.c') diff --git a/ext/pcre/pcre2lib/pcre2_extuni.c b/ext/pcre/pcre2lib/pcre2_extuni.c index 11a0bfbdd6..237211abf7 100644 --- a/ext/pcre/pcre2lib/pcre2_extuni.c +++ b/ext/pcre/pcre2lib/pcre2_extuni.c @@ -129,11 +129,11 @@ while (eptr < end_subject) if ((ricount & 1) != 0) break; /* Grapheme break required */ } - /* If Extend follows E_Base[_GAZ] do not update lgb; this allows - any number of Extend before a following E_Modifier. */ + /* If Extend or ZWJ follows Extended_Pictographic, do not update lgb; this + allows any number of them before a following Extended_Pictographic. */ - if (rgb != ucp_gbExtend || - (lgb != ucp_gbE_Base && lgb != ucp_gbE_Base_GAZ)) + if ((rgb != ucp_gbExtend && rgb != ucp_gbZWJ) || + lgb != ucp_gbExtended_Pictographic) lgb = rgb; eptr += len; -- cgit v1.2.1