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

Make Object.prototype.toString show the underlying object. bug 420480, r+a=brendan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@247222 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mrbkap%gmail.com 2008-03-06 19:57:16 +00:00
parent 2398975f2a
commit 8cf62a7419
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1010,13 +1010,25 @@ obj_toString(JSContext *cx, uintN argc, jsval *vp)
JSObject *obj;
jschar *chars;
size_t nchars;
JSClass *clasp;
const char *clazz, *prefix;
JSString *str;
obj = JS_THIS_OBJECT(cx, vp);
if (!obj)
return JS_FALSE;
clazz = OBJ_GET_CLASS(cx, obj)->name;
clasp = OBJ_GET_CLASS(cx, obj);
if (clasp->flags & JSCLASS_IS_EXTENDED) {
JSExtendedClass *xclasp;
JSObject *obj2;
if ((xclasp = (JSExtendedClass *)clasp)->wrappedObject &&
(obj2 = xclasp->wrappedObject(cx, obj))) {
obj = obj2;
clasp = OBJ_GET_CLASS(cx, obj);
}
}
clazz = clasp->name;
nchars = 9 + strlen(clazz); /* 9 for "[object ]" */
chars = (jschar *) JS_malloc(cx, (nchars + 1) * sizeof(jschar));
if (!chars)