Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improves fallback code in Utf8String::extractWords() #8298

Merged
merged 1 commit into from
Jul 25, 2024
Merged

Improves fallback code in Utf8String::extractWords() #8298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 37 additions & 23 deletions Sources/Tasks/UpdateUnicode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,27 +246,40 @@ class UpdateUnicode extends BackgroundTask
'PropList.txt',
'emoji/emoji-data.txt',
'extracted/DerivedGeneralCategory.txt',
'auxiliary/WordBreakProperty.txt',
],
'props' => [
'ALetter',
'Bidi_Control',
'Case_Ignorable',
'Cn',
'Default_Ignorable_Code_Point',
'Emoji',
'Emoji_Modifier',
'Extend',
'ExtendNumLet',
'Format',
'Hebrew_Letter',
'Ideographic',
'Join_Control',
'Katakana',
'MidLetter',
'MidNum',
'MidNumLet',
'Numeric',
'Regional_Indicator',
'Variation_Selector',
'WSegSpace',
],
'desc' => [
'Helper function for utf8_sanitize_invisibles and utf8_convert_case.',
'',
'Character class lists compiled from:',
'https://unicode.org/Public/UNIDATA/DerivedCoreProperties.txt',
'https://unicode.org/Public/UNIDATA/PropList.txt',
'https://unicode.org/Public/UNIDATA/emoji/emoji-data.txt',
'https://unicode.org/Public/UNIDATA/extracted/DerivedGeneralCategory.txt',
self::DATA_URL_UCD . '/DerivedCoreProperties.txt',
self::DATA_URL_UCD . '/PropList.txt',
self::DATA_URL_UCD . '/emoji/emoji-data.txt',
self::DATA_URL_UCD . '/extracted/DerivedGeneralCategory.txt',
self::DATA_URL_UCD . '/auxiliary/WordBreakProperty.txt',
],
'return' => [
'type' => 'array',
Expand All @@ -282,8 +295,8 @@ class UpdateUnicode extends BackgroundTask
'Helper function for utf8_sanitize_invisibles.',
'',
'Character class lists compiled from:',
'https://unicode.org/Public/UNIDATA/StandardizedVariants.txt',
'https://unicode.org/Public/UNIDATA/emoji/emoji-variation-sequences.txt',
self::DATA_URL_UCD . '/StandardizedVariants.txt',
self::DATA_URL_UCD . '/emoji/emoji-variation-sequences.txt',
],
'return' => [
'type' => 'array',
Expand All @@ -299,7 +312,7 @@ class UpdateUnicode extends BackgroundTask
'Helper function for utf8_sanitize_invisibles.',
'',
'Character class lists compiled from:',
'https://unicode.org/Public/UNIDATA/extracted/DerivedJoiningType.txt',
self::DATA_URL_UCD . '/extracted/DerivedJoiningType.txt',
],
'return' => [
'type' => 'array',
Expand All @@ -315,8 +328,8 @@ class UpdateUnicode extends BackgroundTask
'Helper function for utf8_sanitize_invisibles.',
'',
'Character class lists compiled from:',
'https://unicode.org/Public/UNIDATA/extracted/DerivedCombiningClass.txt',
'https://unicode.org/Public/UNIDATA/IndicSyllabicCategory.txt',
self::DATA_URL_UCD . '/extracted/DerivedCombiningClass.txt',
self::DATA_URL_UCD . '/IndicSyllabicCategory.txt',
],
'return' => [
'type' => 'array',
Expand All @@ -332,7 +345,7 @@ class UpdateUnicode extends BackgroundTask
'Helper function for utf8_is_normalized.',
'',
'Character class lists compiled from:',
'https://unicode.org/Public/UNIDATA/extracted/DerivedNormalizationProps.txt',
self::DATA_URL_UCD . '/extracted/DerivedNormalizationProps.txt',
],
'return' => [
'type' => 'array',
Expand Down Expand Up @@ -517,6 +530,7 @@ class UpdateUnicode extends BackgroundTask
'emoji/emoji-variation-sequences.txt',
'extracted/DerivedGeneralCategory.txt',
'extracted/DerivedJoiningType.txt',
'auxiliary/WordBreakProperty.txt',
],
self::DATA_URL_IDNA => [
'IdnaMappingTable.txt',
Expand Down Expand Up @@ -1479,25 +1493,25 @@ private function build_regex_properties(): bool
}

$this->funcs['utf8_regex_properties']['data'][$fields[1]][] = '\\x{' . str_replace('..', '}-\\x{', $fields[0]) . '}';
}

// We also track 'Default_Ignorable_Code_Point' property in a separate array.
if ($fields[1] !== 'Default_Ignorable_Code_Point') {
continue;
$this->funcs['utf8_regex_properties']['data'][$fields[1]] = array_unique($this->funcs['utf8_regex_properties']['data'][$fields[1]]);
}

if (!str_contains($fields[0], '..')) {
$this->funcs['utf8_default_ignorables']['data'][] = '&#x' . $fields[0] . ';';
} else {
list($start, $end) = explode('..', $fields[0]);
// We also track 'Default_Ignorable_Code_Point' property in a separate array.
if ($fields[1] === 'Default_Ignorable_Code_Point') {
if (!str_contains($fields[0], '..')) {
$this->funcs['utf8_default_ignorables']['data'][] = '&#x' . $fields[0] . ';';
} else {
list($start, $end) = explode('..', $fields[0]);

$ord_s = hexdec($start);
$ord_e = hexdec($end);
$ord_s = hexdec($start);
$ord_e = hexdec($end);

$ord = $ord_s;
$ord = $ord_s;

while ($ord <= $ord_e) {
$this->funcs['utf8_default_ignorables']['data'][] = '&#x' . strtoupper(sprintf('%04s', dechex($ord++))) . ';';
while ($ord <= $ord_e) {
$this->funcs['utf8_default_ignorables']['data'][] = '&#x' . strtoupper(sprintf('%04s', dechex($ord++))) . ';';
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/Unicode/QuickCheck.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* Helper function for utf8_is_normalized.
*
* Character class lists compiled from:
* https://unicode.org/Public/UNIDATA/extracted/DerivedNormalizationProps.txt
* https://www.unicode.org/Public/UCD/latest/ucd/extracted/DerivedNormalizationProps.txt
*
* Developers: Do not update the data in this function manually. Instead,
* run "php -f other/update_unicode_data.php" on the command line.
Expand Down
Loading
Loading