archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8214245: Case insensitive matching doesn't work correctly for some character classes

Browse source 
Reviewed-by: rriggs, darcy
This commit is contained in:
Ivan Gerasimov 2020-03-18 01:04:22 -07:00
parent e827f4ae1c
commit 1d4a4fed43
3 changed files with 164 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/java.base/share/classes/java/util/regex/Pattern.java
View file

@ -2904,7 +2904,7 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
break;
case "gc":
case "general_category":
p = CharPredicates.forProperty(value);
p = CharPredicates.forProperty(value, has(CASE_INSENSITIVE));
break;
default:
break;
@ -2920,17 +2920,16 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
} else if (name.startsWith("Is")) {
// \p{IsGeneralCategory} and \p{IsScriptName}
String shortName = name.substring(2);
p = CharPredicates.forUnicodeProperty(shortName);
p = CharPredicates.forUnicodeProperty(shortName, has(CASE_INSENSITIVE));
if (p == null)
p = CharPredicates.forProperty(shortName);
p = CharPredicates.forProperty(shortName, has(CASE_INSENSITIVE));
if (p == null)
p = CharPredicates.forUnicodeScript(shortName);
} else {
if (has(UNICODE_CHARACTER_CLASS)) {
p = CharPredicates.forPOSIXName(name);
}
if (has(UNICODE_CHARACTER_CLASS))
p = CharPredicates.forPOSIXName(name, has(CASE_INSENSITIVE));
if (p == null)
p = CharPredicates.forProperty(name);
p = CharPredicates.forProperty(name, has(CASE_INSENSITIVE));
}
if (p == null)
throw error("Unknown character property name {" + name + "}");
@ -5675,7 +5674,7 @@ NEXT: while (i <= last) {
return ch -> is(ch) || p.is(ch);
}
default CharPredicate union(CharPredicate p1,
CharPredicate p2 ) {
CharPredicate p2) {
return ch -> is(ch) || p1.is(ch) || p2.is(ch);
}
default CharPredicate negate() {