Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 13:57:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed two instances where prefix match would return undefined instead of null

Browse Source
This commit is contained in:
matthias%sorted.org 2001-03-01 16:52:23 +00:00
parent 79f80cf493
commit ebbd7aaa6c
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/rhino/org/mozilla/javascript/regexp/NativeRegExp.java
View File

@ -1634,15 +1634,13 @@ public class NativeRegExp extends ScriptableObject implements Function {
if (parsub == null)
parsub = state.parens[num] = new SubString();
int length = parsub.length;
if ((input.length - index) < length) {
return state.noMoreInput();
}
else {
for (int i = 0; i < length; i++, index++) {
if (!matchChar(state.flags, input[index],
parsub.charArray[parsub.index + i]))
return -1;
for (int i = 0; i < length; i++, index++) {
if (index >= input.length) {
return state.noMoreInput();
}
if (!matchChar(state.flags, input[index],
parsub.charArray[parsub.index + i]))
return -1;
}
}
break;
@ -1826,10 +1824,10 @@ public class NativeRegExp extends ScriptableObject implements Function {
: this.source.toCharArray();
int start = ((Integer)ren.kid).intValue();
int length = ren.kid2 - start;
if ((input.length - index) < length) {
return state.noMoreInput();
}
for (int i = 0; i < length; i++, index++) {
if (index >= input.length) {
return state.noMoreInput();
}
if (!matchChar(state.flags, input[index],
source[start + i]))
return -1;

20
js/rhino/src/org/mozilla/javascript/regexp/NativeRegExp.java
View File

@ -1634,15 +1634,13 @@ public class NativeRegExp extends ScriptableObject implements Function {
if (parsub == null)
parsub = state.parens[num] = new SubString();
int length = parsub.length;
if ((input.length - index) < length) {
return state.noMoreInput();
}
else {
for (int i = 0; i < length; i++, index++) {
if (!matchChar(state.flags, input[index],
parsub.charArray[parsub.index + i]))
return -1;
for (int i = 0; i < length; i++, index++) {
if (index >= input.length) {
return state.noMoreInput();
}
if (!matchChar(state.flags, input[index],
parsub.charArray[parsub.index + i]))
return -1;
}
}
break;
@ -1826,10 +1824,10 @@ public class NativeRegExp extends ScriptableObject implements Function {
: this.source.toCharArray();
int start = ((Integer)ren.kid).intValue();
int length = ren.kid2 - start;
if ((input.length - index) < length) {
return state.noMoreInput();
}
for (int i = 0; i < length; i++, index++) {
if (index >= input.length) {
return state.noMoreInput();
}
if (!matchChar(state.flags, input[index],
source[start + i]))
return -1;