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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@17294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 0 deletions

diff --git a/eval.c b/eval.c
index 28384488a..967c5befe 100644
--- a/eval.c
+++ b/eval.c
@@ -2441,6 +2441,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: