infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-10 06:59:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Michael Fang 2013-04-26 14:16:23 -07:00
commit e3d2e3af08
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4334,7 +4334,6 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
info.deterministic = detm;
else
info.deterministic = false;
return next.study(info);
}
}
@ -4415,6 +4414,8 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
}
// Aggressive group match
boolean match0(Matcher matcher, int i, int j, CharSequence seq) {
// don't back off passing the starting "j"
int min = j;
int[] groups = matcher.groups;
int save0 = 0;
int save1 = 0;
@ -4452,7 +4453,7 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
break;
}
}
while (j > cmin) {
while (j > min) {
if (next.match(matcher, i, seq)) {
if (capture) {
groups[groupIndex+1] = i;
@ -4544,7 +4545,6 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
} else {
info.deterministic = false;
}
return next.study(info);
}
}

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

@ -33,7 +33,7 @@
* 5013885 5003322 4988891 5098443 5110268 6173522 4829857 5027748 6376940
* 6358731 6178785 6284152 6231989 6497148 6486934 6233084 6504326 6635133
* 6350801 6676425 6878475 6919132 6931676 6948903 6990617 7014645 7039066
* 7067045 7014640 7189363
* 7067045 7014640 7189363 8007395
*/
import java.util.regex.*;
@ -144,6 +144,7 @@ public class RegExTest {
horizontalAndVerticalWSTest();
linebreakTest();
branchTest();
groupCurlyNotFoundSuppTest();
if (failure) {
throw new
RuntimeException("RegExTest failed, 1st failure: " +
@ -3947,4 +3948,27 @@ public class RegExTest {
report("branchTest");
}
// This test is for 8007395
private static void groupCurlyNotFoundSuppTest() throws Exception {
String input = "test this as \ud83d\ude0d";
for (String pStr : new String[] { "test(.)+(@[a-zA-Z.]+)",
"test(.)*(@[a-zA-Z.]+)",
"test([^B])+(@[a-zA-Z.]+)",
"test([^B])*(@[a-zA-Z.]+)",
"test(\\P{IsControl})+(@[a-zA-Z.]+)",
"test(\\P{IsControl})*(@[a-zA-Z.]+)",
}) {
Matcher m = Pattern.compile(pStr, Pattern.CASE_INSENSITIVE)
.matcher(input);
try {
if (m.find()) {
failCount++;
}
} catch (Exception x) {
failCount++;
}
}
report("GroupCurly NotFoundSupp");
}
}