mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/token.c: single- and double-quoted root-level fix.
* lib/yaml.rb (YAML::object_maker): can create object attributes (such as found in Exception class) * lib/yaml/rubytypes.rb: roundtripping of Exception and subclasses. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3458bf4328
commit
9bb4160189
4 changed files with 100 additions and 51 deletions
17
lib/yaml.rb
17
lib/yaml.rb
|
@ -124,13 +124,20 @@ module YAML
|
|||
#
|
||||
# Allocate blank object
|
||||
#
|
||||
def YAML.object_maker( obj_class, val )
|
||||
def YAML.object_maker( obj_class, val, is_attr = false )
|
||||
if Hash === val
|
||||
name = obj_class.name
|
||||
o = ::Marshal.load( sprintf( "\004\006o:%c%s\000", name.length + 5, name ))
|
||||
val.each_pair { |k,v|
|
||||
o.instance_eval "@#{k} = v"
|
||||
}
|
||||
ostr = sprintf( "\004\006o:%c%s\000", name.length + 5, name )
|
||||
if is_attr
|
||||
ostr[ -1, 1 ] = Marshal.dump( val ).sub( /^[^{]+\{/, '' )
|
||||
p ostr
|
||||
end
|
||||
o = ::Marshal.load( ostr )
|
||||
unless is_attr
|
||||
val.each_pair { |k,v|
|
||||
o.instance_eval "@#{k} = v"
|
||||
}
|
||||
end
|
||||
o
|
||||
else
|
||||
raise YAML::Error, "Invalid object explicitly tagged !ruby/Object: " + val.inspect
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue