diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | iseq.c | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Wed Oct 14 14:11:42 2015 Brian Black <bblack@veracode.com> + + * iseq.c (rb_insn_operand_intern): change kw in callinfo disasm from the + number of keyword arguments to an ordered list of the keywords used. + [Feature #11589] + Wed Oct 14 13:58:44 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (parser_nextc): send a warning to ripper, not to STDERR @@ -1292,7 +1292,9 @@ rb_insn_operand_intern(const rb_iseq_t *iseq, rb_ary_push(ary, rb_sprintf("argc:%d", ci->orig_argc)); if (ci->flag & VM_CALL_KWARG) { - rb_ary_push(ary, rb_sprintf("kw:%d", ((struct rb_call_info_with_kwarg *)ci)->kw_arg->keyword_len)); + struct rb_call_info_kw_arg *kw_args = ((struct rb_call_info_with_kwarg *)ci)->kw_arg; + VALUE kw_ary = rb_ary_new_from_values(kw_args->keyword_len, kw_args->keywords); + rb_ary_push(ary, rb_sprintf("kw:[%"PRIsVALUE"]", rb_ary_join(kw_ary, rb_str_new2(",")))); } if (ci->flag) { |