1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8230338: Accurate error message about bad Unicode block name

Browse Source 
Reviewed-by: rriggs
This commit is contained in:
Ivan Gerasimov 2019-08-29 07:39:06 -07:00
parent b4c63048bb
commit d607548f20
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java.base/share/classes/java/util/regex/Pattern.java
View File

@ -2888,12 +2888,12 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
p = CharPredicates.forUnicodeBlock(name.substring(2));
} else if (name.startsWith("Is")) {
// \p{IsGeneralCategory} and \p{IsScriptName}
name = name.substring(2);
p = CharPredicates.forUnicodeProperty(name);
String shortName = name.substring(2);
p = CharPredicates.forUnicodeProperty(shortName);
if (p == null)
p = CharPredicates.forProperty(name);
p = CharPredicates.forProperty(shortName);
if (p == null)
p = CharPredicates.forUnicodeScript(name);
p = CharPredicates.forUnicodeScript(shortName);
} else {
if (has(UNICODE_CHARACTER_CLASS)) {
p = CharPredicates.forPOSIXName(name);
@ -2902,7 +2902,7 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
p = CharPredicates.forProperty(name);
}
if (p == null)
throw error("Unknown character property name {In/Is" + name + "}");
throw error("Unknown character property name {" + name + "}");
}
if (isComplement) {
// it might be too expensive to detect if a complement of