ruby-changes:9313
From: knu <ko1@a...>
Date: Wed, 17 Dec 2008 21:10:54 +0900 (JST)
Subject: [ruby-changes:9313] Ruby:r20851 (ruby_1_8): * enumerator.c (inspect_enumerator): Implement #inspect.
knu 2008-12-17 21:10:30 +0900 (Wed, 17 Dec 2008) New Revision: 20851 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20851 Log: * enumerator.c (inspect_enumerator): Implement #inspect. [ruby-dev:37248]-[ruby-dev:37263] Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/NEWS branches/ruby_1_8/enumerator.c Index: ruby_1_8/NEWS =================================================================== --- ruby_1_8/NEWS (revision 20850) +++ ruby_1_8/NEWS (revision 20851) @@ -40,6 +40,10 @@ Now calls the "rewind" method of the enclosed object if defined. + * Enumerator#inspect + + Implemented. + * Hash#default_proc= New method. Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 20850) +++ ruby_1_8/ChangeLog (revision 20851) @@ -1,3 +1,8 @@ +Wed Dec 17 21:02:55 2008 Akinori MUSHA <knu@i...> + + * enumerator.c (inspect_enumerator): Implement #inspect. + [ruby-dev:37248]-[ruby-dev:37263] + Wed Dec 17 20:06:32 2008 Akinori MUSHA <knu@i...> * lib/date.rb (once): Use Object#object_id instead of Symbol#to_i; Index: ruby_1_8/enumerator.c =================================================================== --- ruby_1_8/enumerator.c (revision 20850) +++ ruby_1_8/enumerator.c (revision 20851) @@ -575,7 +575,73 @@ } } +static VALUE +inspect_enumerator(obj, dummy, recur) + VALUE obj, dummy; + int recur; +{ + struct enumerator *e = enumerator_ptr(obj); + const char *cname = rb_obj_classname(obj); + VALUE eobj, str; + int tainted; + + if (recur) { + str = rb_str_buf_new2("#<"); + rb_str_buf_cat2(str, cname); + rb_str_buf_cat2(str, ": ...>"); + OBJ_TAINT(str); + return str; + } + + eobj = e->obj; + + tainted = OBJ_TAINTED(eobj); + + /* (1..100).each_cons(2) => "#<Enumerator: 1..100:each_cons(2)>" */ + str = rb_str_buf_new2("#<"); + rb_str_buf_cat2(str, cname); + rb_str_buf_cat2(str, ": "); + rb_str_concat(str, rb_inspect(eobj)); + rb_str_buf_cat2(str, ":"); + rb_str_buf_cat2(str, rb_id2name(e->meth)); + + if (e->args) { + int argc = RARRAY_LEN(e->args); + VALUE *argv = RARRAY_PTR(e->args); + + rb_str_buf_cat2(str, "("); + + while (argc--) { + VALUE arg = *argv++; + + rb_str_concat(str, rb_inspect(arg)); + rb_str_buf_cat2(str, argc > 0 ? ", " : ")"); + + if (OBJ_TAINTED(arg)) tainted = Qtrue; + } + } + + rb_str_buf_cat2(str, ">"); + + if (tainted) OBJ_TAINT(str); + return str; +} + /* + * call-seq: + * e.inspect => string + * + * Create a printable version of <i>e</i>. + */ + +static VALUE +enumerator_inspect(obj) + VALUE obj; +{ + return rb_exec_recursive(inspect_enumerator, obj, 0); +} + +/* * Yielder */ @@ -836,6 +902,7 @@ rb_define_method(rb_cEnumerator, "with_object", enumerator_with_object, 1); rb_define_method(rb_cEnumerator, "next", enumerator_next, 0); rb_define_method(rb_cEnumerator, "rewind", enumerator_rewind, 0); + rb_define_method(rb_cEnumerator, "inspect", enumerator_inspect, 0); rb_eStopIteration = rb_define_class("StopIteration", rb_eIndexError); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/