diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:11:46 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:11:46 +0000 |
| commit | e826790f3980451608701061a9a48b362d477426 (patch) | |
| tree | 9591c820c3169307bb9c6e6f82f614e57817c0d3 /lib/yaml/types.rb | |
| parent | 1033db98fea0710b48e4f313d2f535f4ceb08feb (diff) | |
merge revision(s) 16082:
* lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit;
merged from 1.9.
* lib/yaml.rb (quick_emit): use combination of object_id and hash to
identify repeated object references, since GC will reuse memory of
objects during output of YAML. [ruby-Bugs-8548] [ruby-Bugs-3698];
merged from 1.9.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/yaml/types.rb')
| -rw-r--r-- | lib/yaml/types.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/yaml/types.rb b/lib/yaml/types.rb index 7897db48e0..3871c628fe 100644 --- a/lib/yaml/types.rb +++ b/lib/yaml/types.rb @@ -45,7 +45,7 @@ module YAML class Object def self.tag_subclasses?; false; end def to_yaml( opts = {} ) - YAML::quick_emit( object_id, opts ) do |out| + YAML::quick_emit( self, opts ) do |out| out.map( "tag:ruby.yaml.org,2002:object:#{ @class }", to_yaml_style ) do |map| @ivars.each do |k,v| map.add( k, v ) @@ -123,7 +123,7 @@ module YAML true end def to_yaml( opts = {} ) - YAML::quick_emit( self.object_id, opts ) do |out| + YAML::quick_emit( self, opts ) do |out| out.seq( taguri, to_yaml_style ) do |seq| self.each do |v| seq.add( Hash[ *v ] ) @@ -173,7 +173,7 @@ module YAML true end def to_yaml( opts = {} ) - YAML::quick_emit( self.object_id, opts ) do |out| + YAML::quick_emit( self, opts ) do |out| out.seq( taguri, to_yaml_style ) do |seq| self.each do |v| seq.add( Hash[ *v ] ) |