shyouhei	2008-06-15 22:08:42 +0900 (Sun, 15 Jun 2008)

  New Revision: 17240

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/ext/syck/rubyext.c
    branches/ruby_1_8_5/lib/yaml/basenode.rb
    branches/ruby_1_8_5/lib/yaml/types.rb
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16074:
    * ext/syck/rubyext.c: Node#value defined twice.
    * lib/yaml/: several method redefinitions causing warnings.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/syck/rubyext.c?r1=17240&r2=17239&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/yaml/basenode.rb?r1=17240&r2=17239&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17240&r2=17239&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/yaml/types.rb?r1=17240&r2=17239&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17240&r2=17239&diff_format=u

Index: ruby_1_8_5/ext/syck/rubyext.c
===================================================================
--- ruby_1_8_5/ext/syck/rubyext.c	(revision 17239)
+++ ruby_1_8_5/ext/syck/rubyext.c	(revision 17240)
@@ -2280,7 +2280,6 @@
      */
     cScalar = rb_define_class_under( rb_syck, "Scalar", cNode );
     rb_define_alloc_func( cScalar, syck_scalar_alloc );
-    rb_define_attr( cNode, "value", 1, 0 );
     rb_define_method( cScalar, "initialize", syck_scalar_initialize, 3 );
     rb_define_method( cScalar, "value=", syck_scalar_value_set, 1 );
     rb_define_method( cScalar, "style=", syck_scalar_style_set, 1 );
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17239)
+++ ruby_1_8_5/ChangeLog	(revision 17240)
@@ -1,3 +1,9 @@
+Sun Jun 15 22:05:45 2008  Akinori MUSHA  <knu@i...>
+
+	* ext/syck/rubyext.c: Node#value defined twice.
+
+	* lib/yaml/: several method redefinitions causing warnings.
+
 Sun Jun 15 22:03:36 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* marshal.c (w_object): add volatile to avoid potential GC bug.  a
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17239)
+++ ruby_1_8_5/version.h	(revision 17240)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 193
+#define RUBY_PATCHLEVEL 194
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/lib/yaml/basenode.rb
===================================================================
--- ruby_1_8_5/lib/yaml/basenode.rb	(revision 17239)
+++ ruby_1_8_5/lib/yaml/basenode.rb	(revision 17240)
@@ -184,7 +184,7 @@
         #
         def []( *key )
             if Hash === @value
-                v = @value.detect { |k,v| k.transform == key.first }
+                v = @value.detect { |k,| k.transform == key.first }
                 v[1] if v
             elsif Array === @value
                 @value.[]( *key )
Index: ruby_1_8_5/lib/yaml/types.rb
===================================================================
--- ruby_1_8_5/lib/yaml/types.rb	(revision 17239)
+++ ruby_1_8_5/lib/yaml/types.rb	(revision 17240)
@@ -10,7 +10,6 @@
     #
     class PrivateType
         def self.tag_subclasses?; false; end
-        attr_accessor :type_id, :value
         verbose, $VERBOSE = $VERBOSE, nil
         def initialize( type, val )
             @type_id = type; @value = val
@@ -28,7 +27,6 @@
     #
     class DomainType
         def self.tag_subclasses?; false; end
-        attr_accessor :domain, :type_id, :value
         verbose, $VERBOSE = $VERBOSE, nil
         def initialize( domain, type, val )
             @domain = domain; @type_id = type; @value = val

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