1.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java Mon Nov 03 07:29:46 2014 +0100
1.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java Mon Nov 03 11:47:41 2014 +0100
1.3 @@ -60,7 +60,9 @@
1.4 if (Character.isDigit(c)) {
1.5 final int onum = num;
1.6 num = num * 10 + EncodingHelper.digitVal(c);
1.7 - if (((onum ^ num) & INT_SIGN_BIT) != 0) return -1;
1.8 + if (((onum ^ num) & INT_SIGN_BIT) != 0) {
1.9 + return -1;
1.10 + }
1.11 } else {
1.12 unfetch();
1.13 break;
1.14 @@ -70,16 +72,19 @@
1.15 return num;
1.16 }
1.17
1.18 - protected final int scanUnsignedHexadecimalNumber(int maxLength) {
1.19 + protected final int scanUnsignedHexadecimalNumber(final int maxLength) {
1.20 final int last = c;
1.21 int num = 0;
1.22 - while(left() && maxLength-- != 0) {
1.23 + int ml = maxLength;
1.24 + while(left() && ml-- != 0) {
1.25 fetch();
1.26 if (EncodingHelper.isXDigit(c)) {
1.27 final int onum = num;
1.28 final int val = EncodingHelper.xdigitVal(c);
1.29 num = (num << 4) + val;
1.30 - if (((onum ^ num) & INT_SIGN_BIT) != 0) return -1;
1.31 + if (((onum ^ num) & INT_SIGN_BIT) != 0) {
1.32 + return -1;
1.33 + }
1.34 } else {
1.35 unfetch();
1.36 break;
1.37 @@ -89,16 +94,19 @@
1.38 return num;
1.39 }
1.40
1.41 - protected final int scanUnsignedOctalNumber(int maxLength) {
1.42 + protected final int scanUnsignedOctalNumber(final int maxLength) {
1.43 final int last = c;
1.44 int num = 0;
1.45 - while(left() && maxLength-- != 0) {
1.46 + int ml = maxLength;
1.47 + while(left() && ml-- != 0) {
1.48 fetch();
1.49 if (Character.isDigit(c) && c < '8') {
1.50 final int onum = num;
1.51 final int val = EncodingHelper.odigitVal(c);
1.52 num = (num << 3) + val;
1.53 - if (((onum ^ num) & INT_SIGN_BIT) != 0) return -1;
1.54 + if (((onum ^ num) & INT_SIGN_BIT) != 0) {
1.55 + return -1;
1.56 + }
1.57 } else {
1.58 unfetch();
1.59 break;
1.60 @@ -144,8 +152,8 @@
1.61 return p < stop ? chars[p] : 0;
1.62 }
1.63
1.64 - protected final boolean peekIs(final int c) {
1.65 - return peek() == c;
1.66 + protected final boolean peekIs(final int ch) {
1.67 + return peek() == ch;
1.68 }
1.69
1.70 protected final boolean left() {
