merge revision(s) 16074:

	* ext/syck/rubyext.c: Node#value defined twice.
	* lib/yaml/: several method redefinitions causing warnings.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e01d4e35a..d65ecbff6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 15 22:05:45 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* 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@ruby-lang.org>
 
 	* marshal.c (w_object): add volatile to avoid potential GC bug.  a
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
index e2de4bbfd0..8cd2da7c4e 100644
--- a/ext/syck/rubyext.c
+++ b/ext/syck/rubyext.c
@@ -2280,7 +2280,6 @@ Init_syck()
      */
     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 );
diff --git a/lib/yaml/basenode.rb b/lib/yaml/basenode.rb
index d24f6172e9..5439903f42 100644
--- a/lib/yaml/basenode.rb
+++ b/lib/yaml/basenode.rb
@@ -184,7 +184,7 @@ module YAML
         #
         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 )
diff --git a/lib/yaml/types.rb b/lib/yaml/types.rb
index 05113f216d..7897db48e0 100644
--- a/lib/yaml/types.rb
+++ b/lib/yaml/types.rb
@@ -10,7 +10,6 @@ module YAML
     #
     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 @@ module YAML
     #
     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
diff --git a/version.h b/version.h
index 338d93b42a..2d35bd7aa7 100644
--- a/version.h
+++ b/version.h
@@ -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