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

Create var bindings for self function and function declarations.

Browse Source
This commit is contained in:
Tor Andersson
2014-01-12 16:25:22 +01:00
parent 52f78c5687
commit d8576fe02c
3 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jscompile.c
+34 -7
View File
@@ -181,6 +181,10 @@ static void clval(JF, js_Ast *exp)
cexp(J, F, exp->a);
emitname(J, F, OP_AMEMBER, exp->b->string);
break;
case EXP_CALL:
/* host functions may return an assignable l-value */
cexp(J, F, exp);
break;
default:
jsC_error(J, exp, "invalid l-value in assignment");
break;
@@ -256,7 +260,7 @@ static void cexp(JF, js_Ast *exp)
break;
case EXP_FUNC:
emitfunction(J, F, OP_FUNEXP, newfun(J, exp->a, exp->b, exp->c));
emitfunction(J, F, OP_CLOSURE, newfun(J, exp->a, exp->b, exp->c));
break;
case EXP_DELETE:
@@ -385,7 +389,6 @@ static void cstm(JF, js_Ast *stm)
switch (stm->type) {
case STM_FUNC:
emitfunction(J, F, OP_FUNDEC, newfun(J, stm->a, stm->b, stm->c));
break;
case STM_BLOCK:
@@ -459,6 +462,34 @@ static void cstmlist(JF, js_Ast *list)
}
}
static void cfundecs(JF, js_Ast *list)
{
while (list) {
js_Ast *stm = list->a;
if (stm->type == STM_FUNC) {
emitfunction(J, F, OP_CLOSURE, newfun(J, stm->a, stm->b, stm->c));
emitname(J, F, OP_VARDEC, stm->a->string);
}
list = list->b;
}
}
static void cfunbody(JF, js_Ast *name, js_Ast *params, js_Ast *body)
{
if (name) {
emitfunction(J, F, OP_CLOSURE, F);
emitname(J, F, OP_VARDEC, name->string);
}
cfundecs(J, F, body);
cstmlist(J, F, body);
if (F->len == 0 || F->code[F->len - 1] != OP_RETURN) {
emit(J, F, OP_UNDEF);
emit(J, F, OP_RETURN);
}
}
static js_Function *newfun(js_State *J, js_Ast *name, js_Ast *params, js_Ast *body)
{
js_Function *F = malloc(sizeof(js_Function));
@@ -477,11 +508,7 @@ static js_Function *newfun(js_State *J, js_Ast *name, js_Ast *params, js_Ast *bo
F->next = J->fun;
J->fun = F;
cstmlist(J, F, body);
if (F->len == 0 || F->code[F->len - 1] != OP_RETURN) {
emit(J, F, OP_UNDEF);
emit(J, F, OP_RETURN);
}
cfunbody(J, F, name, params, body);
return F;
}
jscompile.h
+1 -2
View File
@@ -6,6 +6,7 @@ enum
OP_POP,
OP_DUP,
OP_CLOSURE,
OP_CONST,
OP_UNDEF,
OP_NULL,
@@ -19,8 +20,6 @@ enum
OP_OBJECTPUT,
OP_VARDEC,
OP_FUNDEC,
OP_FUNEXP,
OP_LOADVAR, /* -(name)- <value> */
OP_LOADINDEX, /* <obj> <idx> -- <value> */
jsdump.c
+5 -4
View File
@@ -626,8 +626,7 @@ void jsC_dumpfunction(js_State *J, js_Function *fun)
case OP_LOADMEMBER:
case OP_AVAR:
case OP_AMEMBER:
case OP_FUNDEC:
case OP_FUNEXP:
case OP_CLOSURE:
pc(' ');
jsC_dumpvalue(J, fun->klist[*p++]);
break;
@@ -650,8 +649,10 @@ void jsC_dumpfunction(js_State *J, js_Function *fun)
for (i = 0; i < fun->klen; i++) {
if (fun->klist[i].type == JS_TFUNCTION) {
nl();
jsC_dumpfunction(J, fun->klist[i].u.function);
if (fun->klist[i].u.function != fun) {
nl();
jsC_dumpfunction(J, fun->klist[i].u.function);
}
}
}
}