aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-30 21:59:12 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-30 21:59:12 +0000
commit8dcf7f931f3879f46a3ac944a3016515a47db7f1 (patch)
treef5c89b3bf8b085688e0eaf24e644606cb6afc706
parent47bc0b90135ddc3169e35150063371f6f3cae922 (diff)
downloadruby-8dcf7f931f3879f46a3ac944a3016515a47db7f1.tar.gz
* string.c (rb_str_scan): already String#scan behaves differently
regarding if block is given. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9056 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--string.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 13d6d2d119..1b0d37f0eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 31 06:59:01 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_scan): already String#scan behaves differently
+ regarding if block is given.
+
Tue Aug 30 23:49:34 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c, dir.c, enum.c, hash.c, io.c, range.c, string.c, struct.c:
diff --git a/string.c b/string.c
index 16c1f02b1b..709c26399c 100644
--- a/string.c
+++ b/string.c
@@ -4272,8 +4272,6 @@ rb_str_scan(str, pat)
long start = 0;
VALUE match = Qnil;
- RETURN_ENUMERATOR(str, 1, &pat);
-
pat = get_pat(pat, 1);
if (!rb_block_given_p()) {
VALUE ary = rb_ary_new();