nobu	2010-04-08 11:45:23 +0900 (Thu, 08 Apr 2010)

  New Revision: 27257

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

  Log:
    * lib/yaml.rb: use Psych if only it is loaded already.

  Modified files:
    trunk/ChangeLog
    trunk/lib/yaml.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27256)
+++ ChangeLog	(revision 27257)
@@ -1,5 +1,7 @@
-Thu Apr  8 11:31:37 2010  Nobuyoshi Nakada  <nobu@r...>
+Thu Apr  8 11:45:14 2010  Nobuyoshi Nakada  <nobu@r...>
 
+	* lib/yaml.rb: use Psych if only it is loaded already.
+
 	* lib/yaml.rb (YAML::EngineManager#yamler): set the result after
 	  successfully switched.
 
Index: lib/yaml.rb
===================================================================
--- lib/yaml.rb	(revision 27256)
+++ lib/yaml.rb	(revision 27257)
@@ -30,6 +30,8 @@
   ENGINE = YAML::EngineManager.new
 end
 
+engine = (!defined?(Syck) && defined?(Psych) ? 'psych' : 'syck')
+
 module Syck
   ENGINE = YAML::ENGINE
 end
@@ -38,4 +40,4 @@
   ENGINE = YAML::ENGINE
 end
 
-YAML::ENGINE.yamler = 'syck'
+YAML::ENGINE.yamler = engine

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