mirror of
https://github.com/ruby/ruby.git
synced 2025-09-15 16:44:01 +02:00
* lib/delegate.rb (marshal_dump/load): Provide forward compatibility [ruby-core:24211]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
21ebe83f54
commit
6696baf6c2
1 changed files with 9 additions and 5 deletions
|
@ -179,17 +179,21 @@ class Delegator
|
||||||
# Serialization support for the object returned by \_\_getobj\_\_.
|
# Serialization support for the object returned by \_\_getobj\_\_.
|
||||||
def marshal_dump
|
def marshal_dump
|
||||||
[
|
[
|
||||||
|
:__v2__,
|
||||||
instance_variables,
|
instance_variables,
|
||||||
instance_variables.map{|var| instance_variable_get(var)},
|
instance_variables.map{|var| instance_variable_get(var)},
|
||||||
__getobj__
|
__getobj__
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
# Reinitializes delegation from a serialized object.
|
# Reinitializes delegation from a serialized object.
|
||||||
def marshal_load(obj)
|
def marshal_load(data)
|
||||||
vars, values, obj = obj
|
version, vars, values, obj = data
|
||||||
|
if version == :__v2__
|
||||||
vars.each_with_index{|var, i| instance_variable_set(var, values[i])}
|
vars.each_with_index{|var, i| instance_variable_set(var, values[i])}
|
||||||
initialize_methods(obj)
|
|
||||||
__setobj__(obj)
|
__setobj__(obj)
|
||||||
|
else
|
||||||
|
__setobj__(data)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue