hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added the local return byte code - BCODE_LOCAL_RETURN -> it returns to the origin of the active context

Browse Source
This commit is contained in:
hyunghwan.chung
2017-01-22 18:01:26 +00:00
parent e80b2bc572
commit 6209b13410
6 changed files with 95 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
moo/lib/comp.c
View File

@ -1432,21 +1432,18 @@ retry:
case '^':
SET_TOKEN_TYPE (moo, MOO_IOTOK_RETURN);
ADD_TOKEN_CHAR(moo, c);
#if 0
GET_CHAR_TO (moo, c);
/* TODO: support explicit block return */
if (c == '^')
{
/* ^^ */
TOKEN_TYPE(moo) == MOO_IOTOK_BLKRET;
TOKEN_TYPE(moo) = MOO_IOTOK_LOCAL_RETURN;
ADD_TOKEN_CHAR (moo, c);
}
else
{
unget_char (moo, &moo->c->lxc);
}
#endif
break;
case '{': /* extension */
@ -4644,6 +4641,12 @@ static int compile_block_statement (moo_t* moo)
if (compile_method_expression(moo, 0) <= -1) return -1;
return emit_byte_instruction (moo, BCODE_RETURN_STACKTOP);
}
else if (TOKEN_TYPE(moo) == MOO_IOTOK_LOCAL_RETURN)
{
GET_TOKEN (moo);
if (compile_method_expression(moo, 0) <= -1) return -1;
return emit_byte_instruction (moo, BCODE_LOCAL_RETURN);
}
else
{
return compile_method_expression(moo, 0);
@ -4664,6 +4667,12 @@ static int compile_method_statement (moo_t* moo)
if (compile_method_expression(moo, 0) <= -1) return -1;
return emit_byte_instruction (moo, BCODE_RETURN_STACKTOP);
}
else if (TOKEN_TYPE(moo) == MOO_IOTOK_LOCAL_RETURN)
{
GET_TOKEN (moo);
if (compile_method_expression(moo, 0) <= -1) return -1;
return emit_byte_instruction (moo, BCODE_LOCAL_RETURN);
}
else
{
/* TODO: optimization. if expresssion is a literal, no push and pop are required */