diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-31 06:27:12 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-31 06:27:12 +0000 |
| commit | c7cb212820f05695259fd0986a288c4f0ea57a55 (patch) | |
| tree | 18d0fbd9c7255db50b6d26dc48d67022e8850d61 /parse.y | |
| parent | 3b53af45843cfda32ae699b4321d874f545e2396 (diff) | |
merge revision(s) 49041: [Backport #10659]
* parse.y (f_kwrest, new_args_tail_gen): unnamed rest keyword and
keywords bits arguments should be unique. since internal IDs
depend on the local variable index in the current scope, new ID
should be made before popping those vtables.
[ruby-core:67157] [Bug #10659]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
| -rw-r--r-- | parse.y | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -4829,6 +4829,7 @@ f_kwrest : kwrest_mark tIDENTIFIER | kwrest_mark { $$ = internal_id(); + arg_var($$); } ; @@ -9768,6 +9769,8 @@ new_args_tail_gen(struct parser_params *parser, NODE *k, ID kr, ID b) kwn = kwn->nd_next; } + kw_bits = internal_id(); + if (kr && is_junk_id(kr)) vtable_pop(lvtbl->args, 1); vtable_pop(lvtbl->args, vtable_size(required_kw_vars) + vtable_size(kw_vars) + (b != 0)); for (i=0; i<vtable_size(required_kw_vars); i++) arg_var(required_kw_vars->tbl[i]); @@ -9775,7 +9778,6 @@ new_args_tail_gen(struct parser_params *parser, NODE *k, ID kr, ID b) vtable_free(required_kw_vars); vtable_free(kw_vars); - kw_bits = internal_id(); arg_var(kw_bits); if (kr) arg_var(kr); if (b) arg_var(b); |