Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More minor style cleanups, plus a teeny optimization from tlundeen@webcrossing.com.

Browse Source
This commit is contained in:
brendan%mozilla.org 2000-05-10 19:58:28 +00:00
parent e4977c0ede
commit d5cc8fbf14
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/src/jsstr.c
View File

@ -18,7 +18,7 @@
* Copyright (C) 1998 Netscape Communications Corporation. All * Copyright (C) 1998 Netscape Communications Corporation. All
* Rights Reserved. * Rights Reserved.
* *
* Contributor(s): * Contributor(s):
* *
* Alternatively, the contents of this file may be used under the * Alternatively, the contents of this file may be used under the
* terms of the GNU Public License (the "GPL"), in which case the * terms of the GNU Public License (the "GPL"), in which case the
@ -1008,10 +1008,9 @@ interpret_dollar(JSContext *cx, jschar *dp, ReplaceData *rdata, size_t *skip)
/* /*
* Allow a real backslash (literal "\\") to escape "$1" etc. * Allow a real backslash (literal "\\") to escape "$1" etc.
* Do this for versions less than 1.5 (ECMA 3) only * Do this for versions less than 1.5 (ECMA 3) only
*/ */
if (cx->version != JSVERSION_DEFAULT && if (cx->version != JSVERSION_DEFAULT && cx->version <= JSVERSION_1_4)
cx->version <= JSVERSION_1_4)
if (dp > rdata->repstr->chars && dp[-1] == '\\') if (dp > rdata->repstr->chars && dp[-1] == '\\')
return NULL; return NULL;
@ -1019,8 +1018,7 @@ interpret_dollar(JSContext *cx, jschar *dp, ReplaceData *rdata, size_t *skip)
res = &cx->regExpStatics; res = &cx->regExpStatics;
dc = dp[1]; dc = dp[1];
if (JS7_ISDEC(dc)) { if (JS7_ISDEC(dc)) {
if (cx->version != JSVERSION_DEFAULT && if (cx->version != JSVERSION_DEFAULT && cx->version <= JSVERSION_1_4) {
cx->version <= JSVERSION_1_4) {
if (dc == '0') if (dc == '0')
return NULL; return NULL;
@ -1309,8 +1307,10 @@ str_replace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
* (i.e. converted to one if necessary) UNLESS it's a reg.exp object. * (i.e. converted to one if necessary) UNLESS it's a reg.exp object.
*/ */
if (!match_or_replace(cx, obj, argc, argv, replace_glob, &rdata.base, rval, if (!match_or_replace(cx, obj, argc, argv, replace_glob, &rdata.base, rval,
(cx->version == JSVERSION_DEFAULT || cx->version > JSVERSION_1_4))) (cx->version == JSVERSION_DEFAULT ||
cx->version > JSVERSION_1_4))) {
return JS_FALSE; return JS_FALSE;
}
if (!rdata.chars) { if (!rdata.chars) {
if (rdata.base.global || *rval != JSVAL_TRUE) { if (rdata.base.global || *rval != JSVAL_TRUE) {
@ -2021,7 +2021,7 @@ static JSFunctionSpec string_methods[] = {
/* Java-like methods. */ /* Java-like methods. */
{js_toString_str, str_toString, 0,0,0}, {js_toString_str, str_toString, 0,0,0},
{js_valueOf_str, str_valueOf, 0,0,0}, {js_valueOf_str, str_valueOf, 0,0,0},
{"substring", str_substring, 2,0,0}, {"substring", str_substring, 1,0,0},
{"toLowerCase", str_toLowerCase, 0,0,0}, {"toLowerCase", str_toLowerCase, 0,0,0},
{"toUpperCase", str_toUpperCase, 0,0,0}, {"toUpperCase", str_toUpperCase, 0,0,0},
{"charAt", str_charAt, 1,0,0}, {"charAt", str_charAt, 1,0,0},
@ -2307,9 +2307,10 @@ js_ValueToSource(JSContext *cx, jsval v)
return js_QuoteString(cx, JSVAL_TO_STRING(v), '"'); return js_QuoteString(cx, JSVAL_TO_STRING(v), '"');
if (!JSVAL_IS_PRIMITIVE(v)) { if (!JSVAL_IS_PRIMITIVE(v)) {
if (!js_TryMethod(cx, JSVAL_TO_OBJECT(v), if (!js_TryMethod(cx, JSVAL_TO_OBJECT(v),
cx->runtime->atomState.toSourceAtom, cx->runtime->atomState.toSourceAtom,
0, NULL, &v)) 0, NULL, &v)) {
return NULL; return NULL;
}
} }
return js_ValueToString(cx, v); return js_ValueToString(cx, v);
} }