diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:51:05 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:51:05 +0000 |
commit | ed4ef1cac4df372adae2dab86d1871b2e3ade86d (patch) | |
tree | 6e2b59bbc1e18a3be931af1b20a54244431788d9 | |
parent | 46149188656f5c2560a0fd78d077c145db0d1d95 (diff) |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | eval.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Jun 15 22:50:34 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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 <usa@ruby-lang.org> * win32/win32.c (rb_w32_select): backport from trunk. @@ -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: @@ -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 |