shyouhei	2008-06-15 22:51:05 +0900 (Sun, 15 Jun 2008)

  New Revision: 17292

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

  Log:
    merge revision(s) 16385:
    * eval.c (is_defined): add NODE_OP_ASGN_{OR,AND}.  "defined?(a||=1)"
      should not operate assignment.  [ruby-dev:34645]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17292&r2=17291&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17292&r2=17291&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/eval.c?r1=17292&r2=17291&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17291)
+++ ruby_1_8_5/ChangeLog	(revision 17292)
@@ -1,3 +1,8 @@
+Sun Jun 15 22:50:34 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@r...>
 
 	* win32/win32.c (rb_w32_select): backport from trunk.
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17291)
+++ ruby_1_8_5/version.h	(revision 17292)
@@ -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
Index: ruby_1_8_5/eval.c
===================================================================
--- ruby_1_8_5/eval.c	(revision 17291)
+++ ruby_1_8_5/eval.c	(revision 17292)
@@ -2413,6 +2413,8 @@
       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:

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