summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-13 00:57:36 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-13 00:57:36 +0000
commit7e9bd8f72c643b7b7ac3ca90293d96fe8a7e7a2d (patch)
tree053dc44f031cf115f0b4ccdbd62b7e227bd6c235
parent56e96b9f73f75a46287358a8097a864b4ab35eb5 (diff)
ext: real class name
* ext/dl/cptr.c (rb_dlptr_inspect): use real class name, not singleton class. * ext/fiddle/pointer.c (rb_fiddle_ptr_inspect): ditto. * ext/strscan/strscan.c (strscan_inspect): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/dl/cptr.c2
-rw-r--r--ext/fiddle/pointer.c2
-rw-r--r--ext/strscan/strscan.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c
index edaa2e66bd..62ab3895b2 100644
--- a/ext/dl/cptr.c
+++ b/ext/dl/cptr.c
@@ -391,7 +391,7 @@ rb_dlptr_inspect(VALUE self)
TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
return rb_sprintf("#<%"PRIsVALUE":%p ptr=%p size=%ld free=%p>",
- CLASS_OF(self), data, data->ptr, data->size, data->free);
+ rb_obj_class(self), data, data->ptr, data->size, data->free);
}
/*
diff --git a/ext/fiddle/pointer.c b/ext/fiddle/pointer.c
index ca09c41850..0129363a8d 100644
--- a/ext/fiddle/pointer.c
+++ b/ext/fiddle/pointer.c
@@ -430,7 +430,7 @@ rb_fiddle_ptr_inspect(VALUE self)
TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
return rb_sprintf("#<%"PRIsVALUE":%p ptr=%p size=%ld free=%p>",
- CLASS_OF(self), data, data->ptr, data->size, data->free);
+ rb_obj_class(self), data, data->ptr, data->size, data->free);
}
/*
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index 1db6898f04..177cfddc15 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -1159,17 +1159,17 @@ strscan_inspect(VALUE self)
p = check_strscan(self);
if (NIL_P(p->str)) {
- a = rb_sprintf("#<%"PRIsVALUE" (uninitialized)>", CLASS_OF(self));
+ a = rb_sprintf("#<%"PRIsVALUE" (uninitialized)>", rb_obj_class(self));
return infect(a, p);
}
if (EOS_P(p)) {
- a = rb_sprintf("#<%"PRIsVALUE" fin>", CLASS_OF(self));
+ a = rb_sprintf("#<%"PRIsVALUE" fin>", rb_obj_class(self));
return infect(a, p);
}
if (p->curr == 0) {
b = inspect2(p);
a = rb_sprintf("#<%"PRIsVALUE" %ld/%ld @ %"PRIsVALUE">",
- CLASS_OF(self),
+ rb_obj_class(self),
p->curr, S_LEN(p),
b);
return infect(a, p);
@@ -1177,7 +1177,7 @@ strscan_inspect(VALUE self)
a = inspect1(p);
b = inspect2(p);
a = rb_sprintf("#<%"PRIsVALUE" %ld/%ld %"PRIsVALUE" @ %"PRIsVALUE">",
- CLASS_OF(self),
+ rb_obj_class(self),
p->curr, S_LEN(p),
a, b);
return infect(a, p);