diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-12 13:49:44 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-12 13:49:44 +0000 |
| commit | 309077c9ae3b530052dce39ab871a04bce1b9468 (patch) | |
| tree | a288b9a5ddd122b5c4f36af1dfcb4525af80b852 /enumerator.c | |
| parent | a698c7bf72931506c78706c2de16eb2b1343ff9d (diff) | |
* enumerator.c (inspect_enumerator): don't raise for uninitialized
enumerator.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enumerator.c')
| -rw-r--r-- | enumerator.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/enumerator.c b/enumerator.c index 53cd49a361..91bb3be14f 100644 --- a/enumerator.c +++ b/enumerator.c @@ -725,11 +725,19 @@ enumerator_rewind(VALUE obj) static VALUE inspect_enumerator(VALUE obj, VALUE dummy, int recur) { - struct enumerator *e = enumerator_ptr(obj); - const char *cname = rb_obj_classname(obj); + struct enumerator *e; + const char *cname; VALUE eobj, str; int tainted, untrusted; + TypedData_Get_Struct(obj, struct enumerator, &enumerator_data_type, e); + + cname = rb_obj_classname(obj); + + if (!e || e->obj == Qundef) { + return rb_sprintf("#<%s: uninitialized>", cname); + } + if (recur) { str = rb_sprintf("#<%s: ...>", cname); OBJ_TAINT(str); |