merging from ruby

1 files changed, 17 insertions, 0 deletions

diff --git a/lib/psych/deprecated.rb b/lib/psych/deprecated.rb
index 1d401d9..f4034e3 100644
--- a/lib/psych/deprecated.rb
+++ b/lib/psych/deprecated.rb
@@ -56,6 +56,23 @@ module Psych
     return thing unless String === thing
     "tag:yaml.org,2002:#{thing}"
   end
+
+  def self.read_type_class type, reference
+    warn "#{caller[0]}: read_type_class is deprecated" if $VERBOSE
+    _, _, type, name = type.split ':', 4
+
+    reference = name.split('::').inject(reference) do |k,n|
+      k.const_get(n.to_sym)
+    end if name
+    [type, reference]
+  end
+
+  def self.object_maker klass, hash
+    warn "#{caller[0]}: object_maker is deprecated" if $VERBOSE
+    klass.allocate.tap do |obj|
+      hash.each { |k,v| obj.instance_variable_set(:"@#{k}", v) }
+    end
+  end
 end
 
 class Object