summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-12 04:35:53 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-12 04:35:53 +0000
commita57d295e36980fe7667f5557c4741339d7684fdc (patch)
tree564f539e7db05a2222460e0a7d4723c5eaa725ab
parent581cd6cfad346063e3cf08ffded90dfe93bbc236 (diff)
iseq.c: preserve encoding
* iseq.c (iseqw_inspect): preserve path encoding in the result. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59065 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--iseq.c9
-rw-r--r--test/ruby/test_iseq.rb8
2 files changed, 13 insertions, 4 deletions
diff --git a/iseq.c b/iseq.c
index 0d66f5a..a4e8667 100644
--- a/iseq.c
+++ b/iseq.c
@@ -983,14 +983,15 @@ static VALUE
iseqw_inspect(VALUE self)
{
const rb_iseq_t *iseq = iseqw_check(self);
+ VALUE klass = rb_class_name(rb_obj_class(self));
if (!iseq->body->location.label) {
- return rb_sprintf("#<%s: uninitialized>", rb_obj_classname(self));
+ return rb_sprintf("#<%"PRIsVALUE": uninitialized>", klass);
}
else {
- return rb_sprintf("<%s:%s@%s>",
- rb_obj_classname(self),
- RSTRING_PTR(iseq->body->location.label), RSTRING_PTR(rb_iseq_path(iseq)));
+ return rb_sprintf("<%"PRIsVALUE":%"PRIsVALUE"@%"PRIsVALUE">",
+ klass,
+ iseq->body->location.label, rb_iseq_path(iseq));
}
}
diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
index df71e18..5425681 100644
--- a/test/ruby/test_iseq.rb
+++ b/test/ruby/test_iseq.rb
@@ -270,4 +270,12 @@ class TestISeq < Test::Unit::TestCase
assert_equal(0, eval("0"))
end;
end
+
+ def test_inspect
+ %W[foo \u{30d1 30b9}].each do |name|
+ assert_match /@#{name}/, ISeq.compile("", name).inspect, name
+ m = ISeq.compile("class TestISeq::Inspect; def #{name}; end; instance_method(:#{name}); end").eval
+ assert_match /:#{name}@/, ISeq.of(m).inspect, name
+ end
+ end
end