infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-09 07:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

8158482: regex UNICODE_CHARACTER_CLASS flag cannot be disabled with an embedded flag expression

Browse Source 
Reviewed-by: bpb
This commit is contained in:
Xueming Shen 2016-06-02 14:03:50 -07:00
parent 5223193974
commit 98e2f679cf
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3194,6 +3194,7 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
break;
case 'U':
flags &= ~(UNICODE_CHARACTER_CLASS | UNICODE_CASE);
break;
default:
return;
}

21
jdk/test/java/util/regex/RegExTest.java
View File

@ -34,7 +34,7 @@
* 7067045 7014640 7189363 8007395 8013252 8013254 8012646 8023647 6559590
* 8027645 8035076 8039124 8035975 8074678 6854417 8143854 8147531 7071819
* 8151481 4867170 7080302 6728861 6995635 6736245 4916384
* 6328855 6192895 6345469 6988218 6693451 7006761 8140212 8143282
* 6328855 6192895 6345469 6988218 6693451 7006761 8140212 8143282 8158482
*
* @library /lib/testlibrary
* @build jdk.testlibrary.*
@ -164,6 +164,7 @@ public class RegExTest {
groupCurlyBackoffTest();
patternAsPredicate();
invalidFlags();
embeddedFlags();
grapheme();
expoBacktracking();
@ -4675,6 +4676,24 @@ public class RegExTest {
report("Invalid compile flags");
}
// This test is for 8158482
private static void embeddedFlags() throws Exception {
try {
Pattern.compile("(?i).(?-i).");
Pattern.compile("(?m).(?-m).");
Pattern.compile("(?s).(?-s).");
Pattern.compile("(?d).(?-d).");
Pattern.compile("(?u).(?-u).");
Pattern.compile("(?c).(?-c).");
Pattern.compile("(?x).(?-x).");
Pattern.compile("(?U).(?-U).");
Pattern.compile("(?imsducxU).(?-imsducxU).");
} catch (PatternSyntaxException x) {
failCount++;
}
report("Embedded flags");
}
private static void grapheme() throws Exception {
Files.lines(Paths.get(System.getProperty("test.src", "."),
"GraphemeBreakTest.txt"))