[前][次][番号順一覧][スレッド一覧]

ruby-changes:23606

From: tenderlove <ko1@a...>
Date: Wed, 16 May 2012 01:34:38 +0900 (JST)
Subject: [ruby-changes:23606] tenderlove:r35657 (trunk): * ext/psych/lib/psych/visitors/to_ruby.rb: convert omap tagged maps to

tenderlove	2012-05-16 01:34:21 +0900 (Wed, 16 May 2012)

  New Revision: 35657

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35657

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/ext/psych/lib/psych/visitors/to_ruby.rb
    trunk/test/psych/test_omap.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35656)
+++ ChangeLog	(revision 35657)
@@ -1,3 +1,10 @@
+Wed May 16 01:31:21 2012  Aaron Patterson <aaron@t...>
+
+	* 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@t...>
 
 	* ext/psych/lib/psych/visitors/yaml_tree.rb: keep a reference to
Index: ext/psych/lib/psych/visitors/to_ruby.rb
===================================================================
--- ext/psych/lib/psych/visitors/to_ruby.rb	(revision 35656)
+++ ext/psych/lib/psych/visitors/to_ruby.rb	(revision 35657)
@@ -222,6 +222,13 @@
         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
Index: test/psych/test_omap.rb
===================================================================
--- test/psych/test_omap.rb	(revision 35656)
+++ test/psych/test_omap.rb	(revision 35657)
@@ -2,6 +2,13 @@
 
 module Psych
   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
       map = Psych::Omap.new
       map['foo'] = 'bar'

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]