* [PATCH] iseq.c (iseq_data_to_ary): dump kw_arg as symbol
@ 2015-07-07 19:37 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2015-07-07 19:37 UTC (permalink / raw)
To: spew
Fix RubyVM::InstructionSequence#to_a after r49517
Keywords were made symbols to fix [Bug #10831] [ruby-core:68031],
so we should dump symbols as-is instead of attempting to convert
them from IDs
* iseq.c (iseq_data_to_ary): dump kw_arg as symbol
* test/-ext-/iseq_load/test_iseq_load.rb: test kw_arg roundtrip
---
iseq.c | 2 +-
test/-ext-/iseq_load/test_iseq_load.rb | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/iseq.c b/iseq.c
index 48de119..1108f77 100644
--- a/iseq.c
+++ b/iseq.c
@@ -1820,7 +1820,7 @@ iseq_data_to_ary(rb_iseq_t *iseq)
orig_argc -= ci->kw_arg->keyword_len;
for (i = 0; i < ci->kw_arg->keyword_len; i++) {
- rb_ary_push(kw, ID2SYM(ci->kw_arg->keywords[i]));
+ rb_ary_push(kw, ci->kw_arg->keywords[i]);
}
rb_hash_aset(e, ID2SYM(rb_intern("kw_arg")), kw);
}
diff --git a/test/-ext-/iseq_load/test_iseq_load.rb b/test/-ext-/iseq_load/test_iseq_load.rb
index 7251603..5dfd69a 100644
--- a/test/-ext-/iseq_load/test_iseq_load.rb
+++ b/test/-ext-/iseq_load/test_iseq_load.rb
@@ -86,6 +86,15 @@ class TestIseqLoad < Test::Unit::TestCase
assert_iseq_roundtrip(src)
end
+ def test_kwarg
+ assert_iseq_roundtrip <<-'end;'
+ def foo(kwarg: :foo)
+ kwarg
+ end
+ foo(kwarg: :bar)
+ end;
+ end
+
# FIXME: still failing
def test_require_integration
skip "iseq loader require integration tests still failing"
--
EW
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-07-07 19:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-07 19:37 [PATCH] iseq.c (iseq_data_to_ary): dump kw_arg as symbol Eric Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).