summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-19 08:19:34 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-19 08:19:34 +0000
commitfe9c4e615b69d06db554cf1116560b353b96a9ed (patch)
treeb9ddf57b6dc56fb6d7c9af76db2aa9ffe06cfb32
parent440fec216c712076701ef81c126c96e09c5a1325 (diff)
merge revision(s) 20578:
* eval.c (rb_yield_0): Qundef means no argument. [ruby-Bugs-22525] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22442 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--eval.c2
-rw-r--r--version.h8
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index abcb212..6409cf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb 19 17:13:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_yield_0): Qundef means no argument. [ruby-Bugs-22525]
+
Wed Feb 18 22:28:00 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_isatty): check whether fd is valid.
diff --git a/eval.c b/eval.c
index bd90b40..623fb7c 100644
--- a/eval.c
+++ b/eval.c
@@ -5060,7 +5060,7 @@ rb_yield_0(val, self, klass, flags, avalue)
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:
diff --git a/version.h b/version.h
index 20ab6bb..b90e109 100644
--- a/version.h
+++ b/version.h
@@ -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[];