mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/psych/lib/psych/visitors/to_ruby.rb: convert omap tagged maps to
Psych::Omap objects rather than hashes. [Bug #6425] * test/psych/test_omap.rb: pertinent test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35657 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
dcf9ae9386
commit
5341e3ccc4
3 changed files with 21 additions and 0 deletions
|
|
@ -1,3 +1,10 @@
|
||||||
|
Wed May 16 01:31:21 2012 Aaron Patterson <aaron@tenderlovemaking.com>
|
||||||
|
|
||||||
|
* ext/psych/lib/psych/visitors/to_ruby.rb: convert omap tagged maps to
|
||||||
|
Psych::Omap objects rather than hashes. [Bug #6425]
|
||||||
|
|
||||||
|
* test/psych/test_omap.rb: pertinent test.
|
||||||
|
|
||||||
Wed May 16 01:15:45 2012 Aaron Patterson <aaron@tenderlovemaking.com>
|
Wed May 16 01:15:45 2012 Aaron Patterson <aaron@tenderlovemaking.com>
|
||||||
|
|
||||||
* ext/psych/lib/psych/visitors/yaml_tree.rb: keep a reference to
|
* ext/psych/lib/psych/visitors/yaml_tree.rb: keep a reference to
|
||||||
|
|
|
||||||
|
|
@ -222,6 +222,13 @@ module Psych
|
||||||
when /^!map:(.*)$/, /^!ruby\/hash:(.*)$/
|
when /^!map:(.*)$/, /^!ruby\/hash:(.*)$/
|
||||||
revive_hash resolve_class($1).new, o
|
revive_hash resolve_class($1).new, o
|
||||||
|
|
||||||
|
when '!omap', 'tag:yaml.org,2002:omap'
|
||||||
|
map = register(o, Psych::Omap.new)
|
||||||
|
o.children.each_slice(2) do |l,r|
|
||||||
|
map[accept(l)] = accept r
|
||||||
|
end
|
||||||
|
map
|
||||||
|
|
||||||
else
|
else
|
||||||
revive_hash({}, o)
|
revive_hash({}, o)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,13 @@ require 'psych/helper'
|
||||||
|
|
||||||
module Psych
|
module Psych
|
||||||
class TestOmap < TestCase
|
class TestOmap < TestCase
|
||||||
|
def test_parse_as_map
|
||||||
|
o = Psych.load "--- !!omap\na: 1\nb: 2"
|
||||||
|
assert_kind_of Psych::Omap, o
|
||||||
|
assert_equal 1, o['a']
|
||||||
|
assert_equal 2, o['b']
|
||||||
|
end
|
||||||
|
|
||||||
def test_self_referential
|
def test_self_referential
|
||||||
map = Psych::Omap.new
|
map = Psych::Omap.new
|
||||||
map['foo'] = 'bar'
|
map['foo'] = 'bar'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue