diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | enum.c | 26 |
2 files changed, 30 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Jul 6 09:04:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * enum.c (enum_join): deals with self recursive objects to get rid + of infinite recursion. [ruby-core:24150] + Mon Jul 6 00:41:41 2009 Tadayoshi Funaba <tadf@dotrb.org> * rational.c: edited rdoc. @@ -1803,6 +1803,30 @@ enum_cycle(int argc, VALUE *argv, VALUE obj) return Qnil; /* not reached */ } +static VALUE +join_i(VALUE i, VALUE args, int argc, VALUE *argv) +{ + VALUE *arg = (VALUE *)args; + ENUM_WANT_SVALUE(); + if (!arg[0]) { + arg[0] = rb_usascii_str_new(0, 0); + } + else if (!NIL_P(arg[1])) { + rb_str_buf_append(arg[0], arg[1]); + } + return rb_str_buf_append(arg[0], rb_obj_as_string(i)); +} + +VALUE +rb_enum_join(VALUE obj, VALUE sep) +{ + VALUE args[2]; + args[0] = 0; + args[1] = sep; + rb_block_call(obj, id_each, 0, 0, join_i, (VALUE)args); + return args[0] ? args[0] : rb_str_new(0, 0); +} + /* * call-seq: * enum.join(sep=$,) -> str @@ -1819,7 +1843,7 @@ enum_join(int argc, VALUE *argv, VALUE obj) rb_scan_args(argc, argv, "01", &sep); if (NIL_P(sep)) sep = rb_output_fs; - return rb_ary_join(enum_to_a(0, 0, obj), sep); + return rb_enum_join(obj, sep); } /* |