knu	2008-04-18 18:56:07 +0900 (Fri, 18 Apr 2008)

  New Revision: 16074

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

  Log:
    * 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/lib/yaml/types.rb?r1=16074&r2=16073&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=16074&r2=16073&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/yaml/basenode.rb?r1=16074&r2=16073&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/syck/rubyext.c?r1=16074&r2=16073&diff_format=u

Index: ruby_1_8/ext/syck/rubyext.c
===================================================================
--- ruby_1_8/ext/syck/rubyext.c	(revision 16073)
+++ ruby_1_8/ext/syck/rubyext.c	(revision 16074)
@@ -2284,7 +2284,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/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 16073)
+++ ruby_1_8/ChangeLog	(revision 16074)
@@ -1,3 +1,9 @@
+Fri Apr 18 18:54:57 2008  Akinori MUSHA  <knu@i...>
+
+	* ext/syck/rubyext.c: Node#value defined twice.
+
+	* lib/yaml/: several method redefinitions causing warnings.
+
 Fri Apr 18 16:36:16 2008  Akinori MUSHA  <knu@i...>
 
 	* lib/rexml/node.rb (REXML::Node::indent): should initialize rv
Index: ruby_1_8/lib/yaml/basenode.rb
===================================================================
--- ruby_1_8/lib/yaml/basenode.rb	(revision 16073)
+++ ruby_1_8/lib/yaml/basenode.rb	(revision 16074)
@@ -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/lib/yaml/types.rb
===================================================================
--- ruby_1_8/lib/yaml/types.rb	(revision 16073)
+++ ruby_1_8/lib/yaml/types.rb	(revision 16074)
@@ -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/