Mirrors_Framework/mujs
1
0
Fork 0
mirror of https://github.com/ccxvii/mujs.git synced 2026-09-24 01:03:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set 'this' object for all types of function calls.

Browse Source
This commit is contained in:
Tor Andersson
2014-01-13 14:33:48 +01:00
parent 58b26070fe
commit d3d073195c
3 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jscompile.c
+28 -15
View File
@@ -214,6 +214,31 @@ static void assignop(JF, js_Ast *exp, int opcode)
emit(J, F, OP_STORE);
}
static void ccall(JF, js_Ast *fun, js_Ast *args)
{
int n;
switch (fun->type) {
case EXP_INDEX:
cexp(J, F, fun->a);
emit(J, F, OP_DUP);
cexp(J, F, fun->b);
emit(J, F, OP_LOADINDEX);
break;
case EXP_MEMBER:
cexp(J, F, fun->a);
emit(J, F, OP_DUP);
emitname(J, F, OP_LOADMEMBER, fun->b->string);
break;
default:
emit(J, F, OP_THIS);
cexp(J, F, fun);
break;
}
n = cargs(J, F, args);
emit(J, F, OP_CALL);
emit(J, F, n);
}
static void cexp(JF, js_Ast *exp)
{
int then, end;
@@ -230,12 +255,12 @@ static void cexp(JF, js_Ast *exp)
case EXP_THIS: emit(J, F, OP_THIS); break;
case EXP_OBJECT:
emit(J, F, OP_OBJECT);
emit(J, F, OP_NEWOBJECT);
cobject(J, F, exp->a);
break;
case EXP_ARRAY:
emit(J, F, OP_ARRAY);
emit(J, F, OP_NEWARRAY);
carray(J, F, exp->a);
break;
@@ -251,19 +276,7 @@ static void cexp(JF, js_Ast *exp)
break;
case EXP_CALL:
if (exp->a->type == EXP_MEMBER) {
cexp(J, F, exp->a->a);
emit(J, F, OP_DUP);
emitname(J, F, OP_LOADMEMBER, exp->a->b->string);
n = cargs(J, F, exp->b);
emit(J, F, OP_TCALL);
emit(J, F, n);
} else {
cexp(J, F, exp->a);
n = cargs(J, F, exp->b);
emit(J, F, OP_CALL);
emit(J, F, n);
}
ccall(J, F, exp->a, exp->b);
break;
case EXP_NEW:
jscompile.h
+4 -5
View File
@@ -14,9 +14,9 @@ enum
OP_FALSE,
OP_THIS,
OP_ARRAY,
OP_NEWARRAY,
OP_ARRAYPUT,
OP_OBJECT,
OP_NEWOBJECT,
OP_OBJECTPUT,
OP_FUNDEC, /* <closure> -(name)- */
@@ -33,9 +33,8 @@ enum
OP_LOAD, /* <addr> -- <addr> <value> */
OP_STORE, /* <addr> <value> -- <value> */
OP_CALL, /* <fun> <args...> -(numargs)- <return value> */
OP_TCALL, /* <obj> <fun> <args...> -(numargs)- <return value> */
OP_NEW,
OP_CALL, /* <thisvalue> <closure> <args...> -(numargs)- <returnvalue> */
OP_NEW, /* <closure> <args...> -(numargs)- <returnvalue> */
OP_DELETE, /* <addr> -- <success> */
OP_PREINC, /* <addr> -- <value+1> */
jsdump.c
-1
View File
@@ -632,7 +632,6 @@ void jsC_dumpfunction(js_State *J, js_Function *fun)
jsC_dumpvalue(J, fun->klist[*p++]);
break;
case OP_CALL:
case OP_TCALL:
case OP_NEW:
printf(" %d", *p++);
break;