diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-06-09 14:36:02 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-06-09 14:36:02 +0000 |
commit | 3f12095fbf552788a2ab0c6e7059527c189aee36 (patch) | |
tree | db27796c9b1eaee0c8fb72fb8f666e3d09450a0d | |
parent | 27c228d6819b125dc3e9277e74a5d2bb30cf75a9 (diff) | |
download | ruby-3f12095fbf552788a2ab0c6e7059527c189aee36.tar.gz |
* enum.c (enum_inject): default the result value to Qundef to use
first element as initial value if not given.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | enum.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Jun 9 23:35:22 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * enum.c (enum_inject): default the result value to Qundef to use + first element as initial value if not given. + Thu Jun 9 19:55:41 2005 Tanaka Akira <akr@m17n.org> * eval.c (ruby_longjmp): new macro to call longjmp, setcontext, etc. @@ -305,8 +305,10 @@ enum_inject(argc, argv, obj) { VALUE memo = Qundef; - rb_scan_args(argc, argv, "01", &memo); + if (rb_scan_args(argc, argv, "01", &memo) == 0) + memo = Qundef; rb_iterate(rb_each, obj, inject_i, (VALUE)&memo); + if (memo == Qundef) return Qnil; return memo; } |