shyouhei	2009-02-19 17:19:34 +0900 (Thu, 19 Feb 2009)

  New Revision: 22442

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22442

  Log:
    merge revision(s) 20578:
    * eval.c (rb_yield_0): Qundef means no argument.  [ruby-Bugs-22525]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/eval.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22441)
+++ ruby_1_8_7/ChangeLog	(revision 22442)
@@ -1,3 +1,7 @@
+Thu Feb 19 17:13:13 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* eval.c (rb_yield_0): Qundef means no argument.  [ruby-Bugs-22525]
+
 Wed Feb 18 22:28:00 2009  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c (rb_w32_isatty): check whether fd is valid.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22441)
+++ ruby_1_8_7/version.h	(revision 22442)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-02-18"
+#define RUBY_RELEASE_DATE "2009-02-19"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090218
-#define RUBY_PATCHLEVEL 127
+#define RUBY_RELEASE_CODE 20090219
+#define RUBY_PATCHLEVEL 128
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/eval.c
===================================================================
--- ruby_1_8_7/eval.c	(revision 22441)
+++ ruby_1_8_7/eval.c	(revision 22442)
@@ -5060,7 +5060,7 @@
 	    switch (node->nd_state) {
 	      case YIELD_FUNC_LAMBDA:
 		if (!avalue) {
-		    val = rb_ary_new3(1, val);
+		    val = (val == Qundef) ? rb_ary_new2(0) : rb_ary_new3(1, val);
 		}
 		break;
 	      case YIELD_FUNC_AVALUE:

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/