summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-01 10:04:21 +0000
committereregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-01 10:04:21 +0000
commitbd14f5bf948d09497c8cad94164f472bbbe94db1 (patch)
tree6569b65d34c640ad40ebaf5179889fe565cfb8ac
parentf0a5e1fc3cd6e6bde9e8c8c25d3b85aa4a2559b4 (diff)
* enum.c (Enumerable#chunk): fix grammar of error message
for symbols beginning with an underscore [Bug #8351] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--enum.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0cf8127575..8a715ee813 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 1 18:59:36 2013 Benoit Daloze <eregontp@gmail.com>
+
+ * enum.c (Enumerable#chunk): fix grammar of error message
+ for symbols beginning with an underscore [Bug #8351]
+
Wed May 1 16:47:47 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/curses/extconf.rb (curses_version): try once for each tests, a
diff --git a/enum.c b/enum.c
index 25c41c969a..76f7343e9d 100644
--- a/enum.c
+++ b/enum.c
@@ -2358,7 +2358,7 @@ chunk_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
}
}
else if (SYMBOL_P(v) && rb_id2name(SYM2ID(v))[0] == '_') {
- rb_raise(rb_eRuntimeError, "symbol begins with an underscore is reserved");
+ rb_raise(rb_eRuntimeError, "symbols beginning with an underscore are reserved");
}
else {
if (NIL_P(argp->prev_value)) {
@@ -2447,7 +2447,7 @@ chunk_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
* Any other symbols that begin with an underscore will raise an error:
*
* items.chunk { |item| :_underscore }
- * #=> RuntimeError: symbol begins with an underscore is reserved
+ * #=> RuntimeError: symbols beginning with an underscore are reserved
*
* +nil+ and +:_separator+ can be used to ignore some elements.
*