admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add OP_ENTER to blocks without parameters; fix #4175

Browse Source 
So that `lambda{}.call(1)` raises `ArgumentError` as CRuby does.
Also, fixed junk assignment for `lambda{|;a|p a}.call{}`.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-02-07 22:44:36 +09:00
parent 156641515c
commit bdc9de875f
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/codegen.c
+4 -1
View File
@@ -734,7 +734,10 @@ lambda_body(codegen_scope *s, node *tree, int blk)
lp->pc0 = new_label(s);
}
tree = tree->cdr;
if (tree->car) {
if (tree->car == NULL) {
genop_W(s, OP_ENTER, 0);
}
else {
mrb_aspec a;
int ma, oa, ra, pa, ka, kd, ba;
int pos, i;
mrbgems/mruby-compiler/core/parse.y
+25 -8
View File
@@ -283,6 +283,20 @@ local_add(parser_state *p, mrb_sym sym)
}
}
static void
local_add_blk(parser_state *p, mrb_sym blk)
{
/* allocate register for block */
local_add_f(p, blk ? blk : mrb_intern_lit(p->mrb, "&"));
}
static void
local_add_kw(parser_state *p, mrb_sym kwd)
{
/* allocate register for keywords hash */
local_add_f(p, kwd ? kwd : mrb_intern_lit(p->mrb, "**"));
}
static node*
locals_node(parser_state *p)
{
@@ -726,13 +740,11 @@ new_args_tail(parser_state *p, node *kws, node *kwrest, mrb_sym blk)
{
node *k;
/* allocate register for keywords hash */
if (kws || kwrest) {
local_add_f(p, (kwrest && kwrest->cdr)? sym(kwrest->cdr) : mrb_intern_lit(p->mrb, "**"));
local_add_kw(p, (kwrest && kwrest->cdr)? sym(kwrest->cdr) : 0);
}
/* allocate register for block */
local_add_f(p, blk? blk : mrb_intern_lit(p->mrb, "&"));
local_add_blk(p, blk);
// allocate register for keywords arguments
// order is for Proc#parameters
@@ -2567,9 +2579,9 @@ block_param : f_arg ',' f_block_optarg ',' f_rest_arg opt_block_args_tail
{
$$ = new_args(p, $1, 0, $3, 0, $4);
}
| f_arg ','
| f_arg ',' opt_block_args_tail
{
$$ = new_args(p, $1, 0, 0, 0, 0);
$$ = new_args(p, $1, 0, 0, 0, $3);
}
| f_arg ',' f_rest_arg ',' f_arg opt_block_args_tail
{
@@ -2610,19 +2622,24 @@ block_param : f_arg ',' f_block_optarg ',' f_rest_arg opt_block_args_tail
;
opt_block_param : none
| block_param_def
{
local_add_blk(p, 0);
$$ = 0;
}
| block_param_def
{
p->cmd_start = TRUE;
$$ = $1;
}
;
block_param_def : '|' opt_bv_decl '|'
block_param_def : '|' {local_add_blk(p, 0);} opt_bv_decl '|'
{
$$ = 0;
}
| tOROP
{
local_add_blk(p, 0);
$$ = 0;
}
| '|' block_param opt_bv_decl '|'