diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-05 03:25:55 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-05 03:25:55 +0000 |
commit | 6c77ae07a5f90f625346ac4193ad8c63c62ba5a1 (patch) | |
tree | 6f5b4e0361c725ee439c0074553ef3c068a5ad78 | |
parent | b4a117f8d3be2aff93521c388587eff8c8601199 (diff) | |
download | ruby-6c77ae07a5f90f625346ac4193ad8c63c62ba5a1.tar.gz |
* enumerator.c (enumerator_with_index): Restore handling of a nil memo
from r39594.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | enumerator.c | 2 |
2 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Mar 5 12:24:23 2013 Eric Hodel <drbrain@segment7.net> + + * enumerator.c (enumerator_with_index): Restore handling of a nil memo + from r39594. + Tue Mar 5 10:40:22 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/objspace/objspace.c (count_nodes): count also newly added nodes, diff --git a/enumerator.c b/enumerator.c index bd039d28bc..7143e37636 100644 --- a/enumerator.c +++ b/enumerator.c @@ -492,6 +492,8 @@ enumerator_with_index(int argc, VALUE *argv, VALUE obj) rb_scan_args(argc, argv, "01", &memo); RETURN_SIZED_ENUMERATOR(obj, argc, argv, enumerator_size); + if (NIL_P(memo)) + memo = INT2NUM(0); return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)&memo); } |