[regexp] extend property classes by script category.
R=littledan@chromium.org BUG=v8:4743 LOG=N Review URL: https://codereview.chromium.org/1774513002 Cr-Commit-Position: refs/heads/master@{#34553}
This commit is contained in:
parent
93e744a777
commit
22f6735ccb
@ -43,6 +43,10 @@ inline bool IsAlphaNumeric(uc32 c) {
|
||||
return IsInRange(AsciiAlphaToLower(c), 'a', 'z') || IsDecimalDigit(c);
|
||||
}
|
||||
|
||||
inline bool IsAlpha(uc32 c) {
|
||||
return IsInRange(AsciiAlphaToLower(c), 'a', 'z');
|
||||
}
|
||||
|
||||
inline bool IsDecimalDigit(uc32 c) {
|
||||
// ECMA-262, 3rd, 7.8.3 (p 16)
|
||||
return IsInRange(c, '0', '9');
|
||||
|
@ -18,6 +18,7 @@ inline bool IsCarriageReturn(uc32 c);
|
||||
inline bool IsLineFeed(uc32 c);
|
||||
inline bool IsAsciiIdentifier(uc32 c);
|
||||
inline bool IsAlphaNumeric(uc32 c);
|
||||
inline bool IsAlpha(uc32 c);
|
||||
inline bool IsDecimalDigit(uc32 c);
|
||||
inline bool IsHexDigit(uc32 c);
|
||||
inline bool IsOctalDigit(uc32 c);
|
||||
|
@ -838,52 +838,59 @@ bool RegExpParser::ParseUnicodeEscape(uc32* value) {
|
||||
|
||||
ZoneList<CharacterRange>* RegExpParser::ParsePropertyClass() {
|
||||
#ifdef V8_I18N_SUPPORT
|
||||
char property_name[3];
|
||||
memset(property_name, 0, sizeof(property_name));
|
||||
ZoneList<char> property_name(0, zone());
|
||||
if (current() == '{') {
|
||||
Advance();
|
||||
if (current() < 'A' || current() > 'Z') return nullptr;
|
||||
property_name[0] = static_cast<char>(current());
|
||||
Advance();
|
||||
if (current() >= 'a' && current() <= 'z') {
|
||||
property_name[1] = static_cast<char>(current());
|
||||
Advance();
|
||||
for (Advance(); IsAlpha(current()); Advance()) {
|
||||
property_name.Add(static_cast<char>(current()), zone());
|
||||
}
|
||||
if (current() != '}') return nullptr;
|
||||
} else if (current() >= 'A' && current() <= 'Z') {
|
||||
property_name[0] = static_cast<char>(current());
|
||||
} else if (IsAlpha(current())) {
|
||||
property_name.Add(static_cast<char>(current()), zone());
|
||||
} else {
|
||||
return nullptr;
|
||||
}
|
||||
Advance();
|
||||
property_name.Add(0, zone()); // null-terminate string.
|
||||
|
||||
int32_t category =
|
||||
u_getPropertyValueEnum(UCHAR_GENERAL_CATEGORY_MASK, property_name);
|
||||
if (category == UCHAR_INVALID_CODE) return nullptr;
|
||||
// Property names are defined in unicode database files. For aliases of
|
||||
// these property names, see PropertyValueAliases.txt.
|
||||
UProperty kPropertyClasses[] = {
|
||||
// General_Category (gc) found in PropertyValueAliases.txt
|
||||
UCHAR_GENERAL_CATEGORY_MASK,
|
||||
// Script (sc) found in Scripts.txt
|
||||
UCHAR_SCRIPT,
|
||||
};
|
||||
|
||||
USet* set = uset_openEmpty();
|
||||
UErrorCode ec = U_ZERO_ERROR;
|
||||
uset_applyIntPropertyValue(set, UCHAR_GENERAL_CATEGORY_MASK, category, &ec);
|
||||
ZoneList<CharacterRange>* ranges = nullptr;
|
||||
if (ec == U_ZERO_ERROR && !uset_isEmpty(set)) {
|
||||
uset_removeAllStrings(set);
|
||||
int item_count = uset_getItemCount(set);
|
||||
ranges = new (zone()) ZoneList<CharacterRange>(item_count, zone());
|
||||
int item_result = 0;
|
||||
for (int i = 0; i < item_count; i++) {
|
||||
uc32 start = 0;
|
||||
uc32 end = 0;
|
||||
item_result += uset_getItem(set, i, &start, &end, nullptr, 0, &ec);
|
||||
ranges->Add(CharacterRange::Range(start, end), zone());
|
||||
for (int i = 0; i < arraysize(kPropertyClasses); i++) {
|
||||
UProperty property_class = kPropertyClasses[i];
|
||||
int32_t category = u_getPropertyValueEnum(
|
||||
property_class, property_name.ToConstVector().start());
|
||||
if (category == UCHAR_INVALID_CODE) continue;
|
||||
|
||||
USet* set = uset_openEmpty();
|
||||
UErrorCode ec = U_ZERO_ERROR;
|
||||
uset_applyIntPropertyValue(set, property_class, category, &ec);
|
||||
ZoneList<CharacterRange>* ranges = nullptr;
|
||||
if (ec == U_ZERO_ERROR && !uset_isEmpty(set)) {
|
||||
uset_removeAllStrings(set);
|
||||
int item_count = uset_getItemCount(set);
|
||||
ranges = new (zone()) ZoneList<CharacterRange>(item_count, zone());
|
||||
int item_result = 0;
|
||||
for (int i = 0; i < item_count; i++) {
|
||||
uc32 start = 0;
|
||||
uc32 end = 0;
|
||||
item_result += uset_getItem(set, i, &start, &end, nullptr, 0, &ec);
|
||||
ranges->Add(CharacterRange::Range(start, end), zone());
|
||||
}
|
||||
DCHECK_EQ(U_ZERO_ERROR, ec);
|
||||
DCHECK_EQ(0, item_result);
|
||||
}
|
||||
DCHECK_EQ(U_ZERO_ERROR, ec);
|
||||
DCHECK_EQ(0, item_result);
|
||||
uset_close(set);
|
||||
return ranges;
|
||||
}
|
||||
uset_close(set);
|
||||
return ranges;
|
||||
#else // V8_I18N_SUPPORT
|
||||
return nullptr;
|
||||
#endif // V8_I18N_SUPPORT
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool RegExpParser::ParseUnlimitedLengthHexNumber(int max_value, uc32* value) {
|
||||
|
39
test/mjsunit/harmony/regexp-property-script-category.js
Normal file
39
test/mjsunit/harmony/regexp-property-script-category.js
Normal file
@ -0,0 +1,39 @@
|
||||
// Copyright 2016 the V8 project authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
// Flags: --harmony-regexp-property
|
||||
|
||||
function t(re, s) { assertTrue(re.test(s)); }
|
||||
function f(re, s) { assertFalse(re.test(s)); }
|
||||
|
||||
t(/\p{Common}+/u, ".");
|
||||
f(/\p{Common}+/u, "supercalifragilisticexpialidocious");
|
||||
|
||||
t(/\p{Han}+/u, "话说天下大势,分久必合,合久必分");
|
||||
t(/\p{Hani}+/u, "吾庄后有一桃园,花开正盛");
|
||||
f(/\p{Han}+/u, "おはようございます");
|
||||
f(/\p{Hani}+/u, "Something is rotten in the state of Denmark");
|
||||
|
||||
t(/\p{Latin}+/u, "Wie froh bin ich, daß ich weg bin!");
|
||||
t(/\p{Latn}+/u,
|
||||
"It was a bright day in April, and the clocks were striking thirteen");
|
||||
f(/\p{Latin}+/u, "奔腾千里荡尘埃,渡水登山紫雾开");
|
||||
f(/\p{Latn}+/u, "いただきます");
|
||||
|
||||
t(/\p{Hiragana}/u, "いただきます");
|
||||
t(/\p{Hira}/u, "ありがとうございました");
|
||||
f(/\p{Hiragana}/u,
|
||||
"Als Gregor Samsa eines Morgens aus unruhigen Träumen erwachte");
|
||||
f(/\p{Hira}/u, "Call me Ishmael");
|
||||
|
||||
t(/\p{Phoenician}/u, "\u{10900}\u{1091a}");
|
||||
t(/\p{Phnx}/u, "\u{1091f}\u{10916}");
|
||||
f(/\p{Phoenician}/u, "Arthur est un perroquet");
|
||||
f(/\p{Phnx}/u, "设心狠毒非良士,操卓原来一路人");
|
||||
|
||||
t(/\p{Grek}/u, "ἄνδρα μοι ἔννεπε, μοῦσα, πολύτροπον, ὃς μάλα πολλὰ");
|
||||
t(/\p{Greek}/u, "μῆνιν ἄειδε θεὰ Πηληϊάδεω Ἀχιλῆος");
|
||||
f(/\p{Greek}/u, "高贤未服英雄志,屈节偏生杰士疑");
|
||||
f(/\p{Greek}/u,
|
||||
"Mr. Jones, of the Manor Farm, had locked the hen-houses for the night");
|
Loading…
Reference in New Issue
Block a user