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

fixed a compiler bug in handling 'super' with multiple messages sent at the same time as in 'super abc + 10'

Browse Source
This commit is contained in:
hyunghwan.chung
2018-05-25 10:19:25 +00:00
parent 90e6e6c8cf
commit d1cfaed466
4 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
moo/lib/comp.c
View File

@ -5409,7 +5409,13 @@ static int compile_message_expression (moo_t* moo, int to_super)
noop_pos = moo->c->mth.code.len;
if (emit_byte_instruction(moo, BCODE_NOOP) <= -1) return -1;
if (compile_binary_message(moo, to_super) <= -1) return -1;
/* to_super is reset to 0 because a unary message
* has been sent to super and this binary message
* is following the unary message.
* for instance, in "super abc + 10", + is sent
* to the 'self' which is the result of super abc */
if (compile_binary_message(moo, 0/*to_super*/) <= -1) return -1;
}
if (TOKEN_TYPE(moo) == MOO_IOTOK_KEYWORD)
@ -5422,7 +5428,9 @@ static int compile_message_expression (moo_t* moo, int to_super)
noop_pos = moo->c->mth.code.len;
if (emit_byte_instruction(moo, BCODE_NOOP) <= -1) return -1;
if (compile_keyword_message(moo, to_super) <= -1) return -1;
/* don't pass to_super. pass 0 as it can't be the
* first message after 'super' */
if (compile_keyword_message(moo, 0/*to_super*/) <= -1) return -1;
}
break;
@ -5441,7 +5449,9 @@ static int compile_message_expression (moo_t* moo, int to_super)
noop_pos = moo->c->mth.code.len;
if (emit_byte_instruction(moo, BCODE_NOOP) <= -1) return -1;
if (compile_keyword_message(moo, to_super) <= -1) return -1;
/* don't pass to_super. pass 0 as it can't be the
* first message after 'super' */
if (compile_keyword_message(moo, 0/*to_super*/) <= -1) return -1;
}
break;

2
moo/lib/exec.c
View File

@ -4001,7 +4001,7 @@ static int send_message (moo_t* moo, moo_oop_char_t selector, int to_super, moo_
mthname.ptr = MOO_OBJ_GET_CHAR_SLOT(selector);
mthname.len = MOO_OBJ_GET_SIZE(selector);
method = moo_findmethod (moo, receiver, &mthname, to_super);
method = moo_findmethod(moo, receiver, &mthname, to_super);
if (!method)
{
static moo_ooch_t fbm[] = {