From 10117968d4d8e234f0a7f56daf2e7682f8024072 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 9 Jun 2005 14:36:02 +0000 Subject: * 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/branches/ruby_1_8@8603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 ++++++- enum.c | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3be579a487..70d10cff31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,13 @@ +Thu Jun 9 23:35:22 2005 Nobuyoshi Nakada + + * 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 * eval.c (ruby_longjmp): new macro to call longjmp, setcontext, etc. (ruby_setjmp): new macro to call setjmp, getcontext, etc. - (ruby_setjmp): call setjmp before getcontext to avoid IA64 register + (ruby_setjmp): call setjmp before getcontext to avoid IA64 register stack problem. [ruby-talk:144939] diff --git a/enum.c b/enum.c index a61a5c16a3..ca52b6f566 100644 --- a/enum.c +++ b/enum.c @@ -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; } -- cgit v1.2.3