summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-24 15:02:01 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-24 15:02:01 +0000
commit0b92090f74fc7f04b8a626f9b82d04d671d5b33e (patch)
tree9e61dd6bf8f7e4815c58eadbfe96fd7afaad1f06
parentce51c136accbbe730736ca94c7941c8b99544982 (diff)
downloadruby-0b92090f74fc7f04b8a626f9b82d04d671d5b33e.tar.gz
ruby-0b92090f74fc7f04b8a626f9b82d04d671d5b33e.tar.xz
ruby-0b92090f74fc7f04b8a626f9b82d04d671d5b33e.zip
* array.c (rb_ary_index, rb_ary_rindex): Emit a warning that a
given block is unused when an argument is specified. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--array.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c2d9f135e..c741c0f5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 24 23:58:52 2009 Akinori MUSHA <knu@iDaemons.org>
+
+ * array.c (rb_ary_index, rb_ary_rindex): Emit a warning that a
+ given block is unused when an argument is specified.
+
Tue Feb 24 22:00:37 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (sockaddr_obj): convert fe80:1::1 to fe80::1%1.
diff --git a/array.c b/array.c
index 696b6473b..79478649c 100644
--- a/array.c
+++ b/array.c
@@ -1128,6 +1128,8 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary)
return Qnil;
}
rb_scan_args(argc, argv, "1", &val);
+ if (rb_block_given_p())
+ rb_warn("given block not used");
for (i=0; i<RARRAY_LEN(ary); i++) {
if (rb_equal(RARRAY_PTR(ary)[i], val))
return LONG2NUM(i);
@@ -1168,6 +1170,8 @@ rb_ary_rindex(int argc, VALUE *argv, VALUE ary)
return Qnil;
}
rb_scan_args(argc, argv, "1", &val);
+ if (rb_block_given_p())
+ rb_warn("given block not used");
while (i--) {
if (rb_equal(RARRAY_PTR(ary)[i], val))
return LONG2NUM(i);