summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-05-15 09:35:02 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-05-15 09:35:02 -0700
commit5be67a387507958aa2e7c5b35035bd1941c0ac1b (patch)
tree67061528b8ae081cee414a3b87cc8bc50e46d60f /lib
parent1606060069c13b2bcdc672a1a0e89202a9eb5166 (diff)
downloadpsych-5be67a387507958aa2e7c5b35035bd1941c0ac1b.zip
* 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.
Diffstat (limited to 'lib')
-rw-r--r--lib/psych/visitors/to_ruby.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/psych/visitors/to_ruby.rb b/lib/psych/visitors/to_ruby.rb
index 2e082f9..26da83b 100644
--- a/lib/psych/visitors/to_ruby.rb
+++ b/lib/psych/visitors/to_ruby.rb
@@ -222,6 +222,13 @@ module Psych
when /^!map:(.*)$/, /^!ruby\/hash:(.*)$/
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
revive_hash({}, o)
end