diff options
| author | why <why@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-20 06:46:45 +0000 |
|---|---|---|
| committer | why <why@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-20 06:46:45 +0000 |
| commit | b36eba6e8752f794d898b9543e40868ad46c2ea9 (patch) | |
| tree | e1dd7146e9bc2cfb3f97950abb16ce6f78b9d943 /lib/yaml/basenode.rb | |
| parent | 56a97f11d039e2fd9107ea76ec2d0af2e447136e (diff) | |
* ext/syck/emitter.c (syck_scan_scalar): prevent indicators from
appearing alone or at the end of plain scalars. [ruby-core:5826]
* ext/syck/emitter.c (syck_emit_scalar): treat typed scalar nodes
as complex keys.
* lib/syck.h: version 0.60.
* lib/yaml/basenode.rb (YAML::BaseNode#at): transform keys during
key searches.
* ext/syck/rubyext.c: loading of binary-typed nodes. prevent
emission of plain strings that look like symbols, but which aren't.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9241 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/yaml/basenode.rb')
| -rw-r--r-- | lib/yaml/basenode.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/yaml/basenode.rb b/lib/yaml/basenode.rb index a98f6d890a..7072b1dcd6 100644 --- a/lib/yaml/basenode.rb +++ b/lib/yaml/basenode.rb @@ -67,8 +67,8 @@ module YAML end def at( seg ) - if Hash === @value and @value.has_key?( seg ) - @value[seg][1] + if Hash === @value + self[seg] elsif Array === @value and seg =~ /\A\d+\Z/ and @value[seg.to_i] @value[seg.to_i] end @@ -99,8 +99,8 @@ module YAML @value.collect { |v| idx += 1 if Hash === @value - match_init = [v[0], v[1][1]] - match_deep = v[1][1].match_segment( ypath, depth ) + match_init = [v[0].transform, v[1]] + match_deep = v[1].match_segment( ypath, depth ) else match_init = [idx, v] match_deep = v.match_segment( ypath, depth ) @@ -127,7 +127,7 @@ module YAML @value.collect { |h| idx += 1 if Hash === @value - [h[0], h[1][1]] + [h[0].transform, h[1]] else [idx, h] end @@ -182,9 +182,9 @@ module YAML # We want the node to act like as Hash # if it is. # - def []( *k ) + def []( *key ) if Hash === @value - v = @value.[]( *k ) + v = @value.detect { |k,v| k.transform == key.first } v[1] if v elsif Array === @value @value.[]( *k ) |