* string.c (rb_str_upto): add optional argument to specify

  exclusiveness.

* range.c (range_step): use String#upto with optional argument.

* range.c (range_each): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 30 insertions, 31 deletions

diff --git a/string.c b/string.c
index f5717b9231..118b9f5975 100644
--- a/string.c
+++ b/string.c
@@ -1549,41 +1549,16 @@ rb_str_succ_bang(VALUE str)
     return str;
 }
 
-VALUE
-rb_str_upto(VALUE beg, VALUE end, int excl)
-{
-    VALUE current, after_end;
-    ID succ = rb_intern("succ");
-    int n;
-
-    StringValue(end);
-    n = rb_str_cmp(beg, end);
-    if (n > 0 || (excl && n == 0)) return beg;
-    after_end = rb_funcall(end, succ, 0, 0);
-    current = beg;
-    while (!rb_str_equal(current, after_end)) {
-	rb_yield(current);
-	if (!excl && rb_str_equal(current, end)) break;
-	current = rb_funcall(current, succ, 0, 0);
-	StringValue(current);
-	if (excl && rb_str_equal(current, end)) break;
-	StringValue(current);
-	if (RSTRING_LEN(current) > RSTRING_LEN(end) || RSTRING_LEN(current) == 0)
-	    break;
-    }
-
-    return beg;
-}
-
 
 /*
  *  call-seq:
- *     str.upto(other_str) {|s| block }   => str
+ *     str.upto(other_str, exclusive=false) {|s| block }   => str
  *  
  *  Iterates through successive values, starting at <i>str</i> and
  *  ending at <i>other_str</i> inclusive, passing each value in turn to
  *  the block. The <code>String#succ</code> method is used to generate
- *  each value.
+ *  each value.  If optional second arguent excle is omitted or is <code>false</code>,
+ *  the last value will be included; otherwise it will be excluded.
  *     
  *     "a8".upto("b6") {|s| print s, ' ' }
  *     for s in "a8".."b6"
@@ -1597,9 +1572,33 @@ rb_str_upto(VALUE beg, VALUE end, int excl)
  */
 
 static VALUE
-rb_str_upto_m(VALUE beg, VALUE end)
+rb_str_upto(int argc, VALUE *argv, VALUE beg)
 {
-    return rb_str_upto(beg, end, Qfalse);
+    VALUE end, exclusive;
+    VALUE current, after_end;
+    ID succ;
+    int n, excl;
+
+    rb_scan_args(argc, argv, "11", &end, &exclusive);
+    excl = RTEST(exclusive);
+    succ = rb_intern("succ");
+    StringValue(end);
+    n = rb_str_cmp(beg, end);
+    if (n > 0 || (excl && n == 0)) return beg;
+    after_end = rb_funcall(end, succ, 0, 0);
+    current = beg;
+    while (!rb_str_equal(current, after_end)) {
+	rb_yield(current);
+	if (!excl && rb_str_equal(current, end)) break;
+	current = rb_funcall(current, succ, 0, 0);
+	StringValue(current);
+	if (excl && rb_str_equal(current, end)) break;
+	StringValue(current);
+	if (RSTRING_LEN(current) > RSTRING_LEN(end) || RSTRING_LEN(current) == 0)
+	    break;
+    }
+
+    return beg;
 }
 
 static VALUE
@@ -4911,7 +4910,7 @@ Init_String(void)
     rb_define_method(rb_cString, "succ!", rb_str_succ_bang, 0);
     rb_define_method(rb_cString, "next", rb_str_succ, 0);
     rb_define_method(rb_cString, "next!", rb_str_succ_bang, 0);
-    rb_define_method(rb_cString, "upto", rb_str_upto_m, 1);
+    rb_define_method(rb_cString, "upto", rb_str_upto, -1);
     rb_define_method(rb_cString, "index", rb_str_index_m, -1);
     rb_define_method(rb_cString, "rindex", rb_str_rindex_m, -1);
     rb_define_method(rb_cString, "replace", rb_str_replace, 1);