Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RegExp().toString and .toSource should return '/(?:)/', not '//' (bug 225550, r=sparky).

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@149282 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brendan%mozilla.org 2003-11-14 03:23:49 +00:00
parent 50c906beb2
commit 149f0d6f02
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/js/src/jsregexp.c
View File

@ -3445,12 +3445,14 @@ JSClass js_RegExpClass = {
regexp_xdrObject, NULL, regexp_mark, 0
};
static const jschar empty_regexp_ucstr[] = {'(', '?', ':', ')', 0};
static JSBool
regexp_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
jsval *rval)
{
JSRegExp *re;
jschar *chars;
jschar *source, *chars;
size_t length, nflags;
uintN flags;
JSString *str;
@ -3465,7 +3467,13 @@ regexp_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
return JS_TRUE;
}
length = JSSTRING_LENGTH(re->source) + 2;
source = JSSTRING_CHARS(re->source);
length = JSSTRING_LENGTH(re->source);
if (length == 0) {
source = empty_regexp_ucstr;
length = sizeof(empty_regexp_ucstr) / sizeof(jschar) - 1;
}
length += 2;
nflags = 0;
for (flags = re->flags; flags != 0; flags &= flags - 1)
nflags++;
@ -3476,7 +3484,7 @@ regexp_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
}
chars[0] = '/';
js_strncpy(&chars[1], JSSTRING_CHARS(re->source), length - 2);
js_strncpy(&chars[1], source, length - 2);
chars[length-1] = '/';
if (nflags) {
if (re->flags & JSREG_GLOB)