e$B1sF#$G$9!#e(B
[ruby-dev:39665] e$B$h$j0zMQ!#e(B
2009e$BG/e(B11e$B7ne(B12e$BF|e(B0:38 Akinori MUSHA [email protected]:
e$B!!e(BYielder/Generator e$B$H$$$&AH9g$;$K$h$k<BAu$O<B83E*$J$b$N$G!“FC$Ke(B
e$B8e<T$O30It$K8x3+$9$kI,MW$,$J$$$N$G4:$($FIz$;$F$$$^$7$?!#8x3+;EMM$Ke(B
[email protected])Ls$K$J$k$N$G!”<{MW$,@8$8$k$^$G$OHs8x3+$NJ}$,$$$$$N$G$O$J$$e(B
e$B$G$7$g$&$+!#e(B
e$B$H$$$&$3$H$J$i!"$J$k$Y$/FbIt<BAu$r%f!<%6$+$i8+$($J$$$h$&$K$7$^$;$s$+!)e(B
- Enumerator::Generator e$B$rF?L>%/%i%9$K$9$ke(B (ARGF e$B$N$h$&$Ke(B)
- Generator.new e$B$de(B Yielder.new e$B$r6X;_$9$ke(B
- Enumerator#inspect e$B$Ge(B Generator e$B$NB8:_$O1#$9e(B
e$B$H$9$k%Q%C%A$r=q$$$F$_$^$7$?!#$I$&$G$7$g$&!#e(B
diff --git a/enumerator.c b/enumerator.c
index 7c50f3d…88c37fd 100644
— a/enumerator.c
+++ b/enumerator.c
@@ -886,29 +886,34 @@ inspect_enumerator(VALUE obj, VALUE dummy, int
recur)
untrusted = OBJ_UNTRUSTED(eobj);
/* (1..100).each_cons(2) => "#<Enumerator: 1..100:each_cons(2)>" */
- str = rb_sprintf("#<%s: ", cname);
- rb_str_concat(str, rb_inspect(eobj));
- rb_str_buf_cat2(str, “:”);
- rb_str_buf_cat2(str, rb_id2name(e->meth));
- if (rb_obj_is_kind_of(eobj, rb_cGenerator)) {
- str = rb_sprintf("#<%s:%p>", cname, (void*)eobj);
- }
- else {
- str = rb_sprintf("#<%s: ", cname);
- rb_str_concat(str, rb_inspect(eobj));
- rb_str_buf_cat2(str, “:”);
- rb_str_buf_cat2(str, rb_id2name(e->meth));
- if (e->args) {
- long argc = RARRAY_LEN(e->args);
- VALUE *argv = RARRAY_PTR(e->args);
-
if (e->args) { -
long argc = RARRAY_LEN(e->args); -
VALUE *argv = RARRAY_PTR(e->args);
- rb_str_buf_cat2(str, “(”);
-
rb_str_buf_cat2(str, "(");
- while (argc–) {
-
VALUE arg = *argv++;
-
while (argc--) { - VALUE arg = *argv++;
-
rb_str_concat(str, rb_inspect(arg)); -
rb_str_buf_cat2(str, argc > 0 ? ", " : ")");
- rb_str_concat(str, rb_inspect(arg));
- rb_str_buf_cat2(str, argc > 0 ? ", " : “)”);
-
if (OBJ_TAINTED(arg)) tainted = TRUE; -
if (OBJ_UNTRUSTED(arg)) untrusted = TRUE; - }
- }
- if (OBJ_TAINTED(arg)) tainted = TRUE;
- if (OBJ_UNTRUSTED(arg)) untrusted = TRUE;
-
} -
}
- rb_str_buf_cat2(str, “>”);
-
rb_str_buf_cat2(str, “>”);
-
}
if (tainted) OBJ_TAINT(str);
if (untrusted) OBJ_UNTRUST(str);
@@ -1223,17 +1228,17 @@ Init_Enumerator(void)
rb_define_method(rb_eStopIteration, “result”, stop_result, 0);/* Generator */
- rb_cGenerator = rb_define_class_under(rb_cEnumerator,
“Generator”, rb_cObject);
- rb_cGenerator = rb_class_new(rb_cObject);
- rb_undef_alloc_func(rb_cGenerator);
- rb_set_class_path(rb_cGenerator, rb_cObject,
“Enumerator::Generator”);
rb_include_module(rb_cGenerator, rb_mEnumerable);
- rb_define_alloc_func(rb_cGenerator, generator_allocate);
- rb_define_method(rb_cGenerator, “initialize”, generator_initialize,
-1); - rb_define_method(rb_cGenerator, “initialize_copy”,
generator_init_copy, 1);
rb_define_method(rb_cGenerator, “each”, generator_each, 0);
-
rb_obj_freeze(rb_cGenerator);
-
rb_gc_register_mark_object(rb_cGenerator);
/* Yielder */
rb_cYielder = rb_define_class_under(rb_cEnumerator, “Yielder”,
rb_cObject);
- rb_define_alloc_func(rb_cYielder, yielder_allocate);
- rb_define_method(rb_cYielder, “initialize”, yielder_initialize, 0);
- rb_undef_alloc_func(rb_cYielder);
rb_define_method(rb_cYielder, “yield”, yielder_yield, -2);
rb_define_method(rb_cYielder, “<<”, yielder_yield_push, -2);