summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-25 18:44:22 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-25 18:44:22 (GMT)
commit606e855622c2694c6bf1a5cec59373bef0d0877e (patch)
tree48dd02c881d87e84e0e94aecfda1ee2628e7d152 /vm.c
parentd0ac6d5879c8d2132a7419ff2b8a4fb3b3a28597 (diff)
rb_id2str over rb_id2name
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/vm.c b/vm.c
index a495da0..ddb93f60 100644
--- a/vm.c
+++ b/vm.c
@@ -1729,15 +1729,14 @@ rb_thread_current_status(const rb_thread_t *th)
if (cfp->pc != 0) {
rb_iseq_t *iseq = cfp->iseq;
int line_no = rb_vm_get_sourceline(cfp);
- char *file = RSTRING_PTR(iseq->location.path);
- str = rb_sprintf("%s:%d:in `%s'",
- file, line_no, RSTRING_PTR(iseq->location.label));
+ str = rb_sprintf("%"PRIsVALUE":%d:in `%"PRIsVALUE"'",
+ iseq->location.path, line_no, iseq->location.label);
}
}
else if (cfp->me->def->original_id) {
- str = rb_sprintf("`%s#%s' (cfunc)",
- rb_class2name(cfp->me->klass),
- rb_id2name(cfp->me->def->original_id));
+ str = rb_sprintf("`%"PRIsVALUE"#%"PRIsVALUE"' (cfunc)",
+ rb_class_path(cfp->me->klass),
+ rb_id2str(cfp->me->def->original_id));
}
return str;