Mirrors_Framework/mujs
1
0
Fork 0
mirror of https://github.com/ccxvii/mujs.git synced 2026-09-26 12:27:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix constructors to return the created object if the function doesn't.

Browse Source
This commit is contained in:
Tor Andersson
2014-01-20 23:15:39 +01:00
parent 7c82ec2541
commit 26cde86041
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jsrun.c
+9 -1
View File
@@ -420,6 +420,7 @@ void js_construct(js_State *J, int n)
{
js_Object *obj = js_toobject(J, -n - 1);
js_Object *prototype;
js_Object *newobj;
/* built-in constructors create their own objects */
if (obj->type == JS_CCFUNCTION && obj->u.c.constructor) {
@@ -439,12 +440,19 @@ void js_construct(js_State *J, int n)
js_pop(J, 1);
/* create a new object with above prototype, and shift it into the 'this' slot */
js_pushobject(J, jsV_newobject(J, JS_COBJECT, prototype));
newobj = jsV_newobject(J, JS_COBJECT, prototype);
js_pushobject(J, newobj);
if (n > 0)
js_rot(J, n + 1);
/* call the function */
js_call(J, n);
/* if result is not an object, return the original object we created */
if (!js_isobject(J, -1)) {
js_pop(J, 1);
js_pushobject(J, newobj);
}
}
/* Exceptions */