diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:09:35 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:09:35 +0000 |
commit | 6b00ba5ccc6f57c62a2b5f52511beb7acad2ef81 (patch) | |
tree | d7a52c3be512e77e12e1479066cf389e54ccd0ea /lib | |
parent | 3dd98cb1a51484fbe253d56615fc50bf16611084 (diff) |
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_6@17242 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/yaml/basenode.rb | 2 | ||||
-rw-r--r-- | lib/yaml/types.rb | 2 |
2 files changed, 1 insertions, 3 deletions
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 |