From 683ad14e2c1bdd5b5ecec8437d67449558d97a99 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 3 Nov 2009 15:16:55 +0000 Subject: * string.c (rb_str_upto): make next object before yield its block. fix: can modify original begin string of String#upto. [ruby-dev:26384] [ruby-dev:39626] #2327 git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index e7f7e8673..f67997939 100644 --- a/string.c +++ b/string.c @@ -2952,11 +2952,14 @@ rb_str_upto(int argc, VALUE *argv, VALUE beg) if (n > 0 || (excl && n == 0)) return beg; after_end = rb_funcall(end, succ, 0, 0); - current = beg; + current = rb_str_dup(beg); while (!rb_str_equal(current, after_end)) { + VALUE next = Qnil; + if (excl || !rb_str_equal(current, end)) + next = rb_funcall(current, succ, 0, 0); rb_yield(current); - if (!excl && rb_str_equal(current, end)) break; - current = rb_funcall(current, succ, 0, 0); + if (NIL_P(next)) break; + current = next; StringValue(current); if (excl && rb_str_equal(current, end)) break; if (RSTRING_LEN(current) > RSTRING_LEN(end) || RSTRING_LEN(current) == 0) -- cgit