summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/syck/rubyext.c1
-rw-r--r--lib/yaml/basenode.rb2
-rw-r--r--lib/yaml/types.rb2
4 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 58c4635791f..d4f0b7e4077 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 16 03:36:01 2007 why the lucky stiff <why@ruby-lang.org>
+
+ * ext/syck/rubyext.c: Node#value defined twice.
+
+ * lib/yaml/: several method redefinitions causing warnings.
+
Fri Nov 16 03:01:00 2007 why the lucky stiff <why@ruby-lang.org>
* lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit.
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
index 53625c91dea..8e01bc176dc 100644
--- a/ext/syck/rubyext.c
+++ b/ext/syck/rubyext.c
@@ -2188,7 +2188,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 d24f6172e90..5439903f422 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 4396e36df27..3871c628fe4 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