tenderlove	2011-10-04 06:00:50 +0900 (Tue, 04 Oct 2011)

  New Revision: 33382

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

  Log:
    * ext/psych/lib/psych/visitors/to_ruby.rb: ToRuby visitor can be
      constructed with a ScalarScanner.
    * ext/psych/lib/psych/visitors/yaml_tree.rb: ScalarScanner can be
      passed to the YAMLTree visitor.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33381)
+++ ChangeLog	(revision 33382)
@@ -1,3 +1,10 @@
+Tue Oct  4 05:59:24 2011  Aaron Patterson <aaron@t...>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: ToRuby visitor can be
+	  constructed with a ScalarScanner.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: ScalarScanner can be
+	  passed to the YAMLTree visitor.
+
 Tue Oct  4 05:47:23 2011  Aaron Patterson <aaron@t...>
 
 	* ext/psych/lib/psych/visitors/to_ruby.rb: Define Regexp::NOENCODING
Index: ext/psych/lib/psych/visitors/yaml_tree.rb
===================================================================
--- ext/psych/lib/psych/visitors/yaml_tree.rb	(revision 33381)
+++ ext/psych/lib/psych/visitors/yaml_tree.rb	(revision 33382)
@@ -12,13 +12,13 @@
       alias :finished? :finished
       alias :started? :started
 
-      def initialize options = {}, emitter = Psych::TreeBuilder.new
+      def initialize options = {}, emitter = TreeBuilder.new, ss = ScalarScanner.new
         super()
         @started  = false
         @finished = false
         @emitter  = emitter
         @st       = {}
-        @ss       = ScalarScanner.new
+        @ss       = ss
         @options  = options
 
         @dispatch_cache = Hash.new do |h,klass|
Index: ext/psych/lib/psych/visitors/to_ruby.rb
===================================================================
--- ext/psych/lib/psych/visitors/to_ruby.rb	(revision 33381)
+++ ext/psych/lib/psych/visitors/to_ruby.rb	(revision 33382)
@@ -9,10 +9,10 @@
     ###
     # This class walks a YAML AST, converting each node to ruby
     class ToRuby < Psych::Visitors::Visitor
-      def initialize
-        super
+      def initialize ss = ScalarScanner.new
+        super()
         @st = {}
-        @ss = ScalarScanner.new
+        @ss = ss
         @domain_types = Psych.domain_types
       end
 

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