From ed4ef1cac4df372adae2dab86d1871b2e3ade86d Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 13:51:05 +0000 Subject: merge revision(s) 16385: * eval.c (is_defined): add NODE_OP_ASGN_{OR,AND}. "defined?(a||=1)" should not operate assignment. [ruby-dev:34645] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 2 ++ version.h | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 783c7ca42f..b46690ffac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 15 22:50:34 2008 Yukihiro Matsumoto + + * eval.c (is_defined): add NODE_OP_ASGN_{OR,AND}. "defined?(a||=1)" + should not operate assignment. [ruby-dev:34645] + Sun Jun 15 22:49:12 2008 NAKAMURA Usaku * win32/win32.c (rb_w32_select): backport from trunk. diff --git a/eval.c b/eval.c index e0a7e17af6..1c7a0717a4 100644 --- a/eval.c +++ b/eval.c @@ -2413,6 +2413,8 @@ is_defined(self, node, buf) case NODE_ATTRSET: case NODE_OP_ASGN1: case NODE_OP_ASGN2: + case NODE_OP_ASGN_OR: + case NODE_OP_ASGN_AND: case NODE_MASGN: case NODE_LASGN: case NODE_DASGN: diff --git a/version.h b/version.h index c5b7dcc351..9cf7f01b61 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 206 +#define RUBY_PATCHLEVEL 207 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3