diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:12:40 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:12:40 +0000 |
commit | 8f136d8a767cf581d5e6f561aecdbed00444f135 (patch) | |
tree | 15b7e40ebf19d9da9088933528df5b36dccb50cb | |
parent | 6b00ba5ccc6f57c62a2b5f52511beb7acad2ef81 (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_6@17246 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | lib/yaml.rb | 4 | ||||
-rw-r--r-- | lib/yaml/rubytypes.rb | 18 | ||||
-rw-r--r-- | lib/yaml/types.rb | 6 | ||||
-rw-r--r-- | test/yaml/test_yaml.rb | 8 | ||||
-rw-r--r-- | version.h | 2 |
6 files changed, 35 insertions, 13 deletions
@@ -1,3 +1,13 @@ +Sun Jun 15 22:12:07 2008 Akinori MUSHA <knu@iDaemons.org> + + * 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. + Sun Jun 15 22:09:02 2008 Akinori MUSHA <knu@iDaemons.org> * ext/syck/rubyext.c: Node#value defined twice. diff --git a/lib/yaml.rb b/lib/yaml.rb index fe8335c8f0..a8da42a321 100644 --- a/lib/yaml.rb +++ b/lib/yaml.rb @@ -384,6 +384,10 @@ module YAML else emitter.reset( opts ) end + oid = + case oid when Fixnum, NilClass; oid + else oid = "#{oid.object_id}-#{oid.hash}" + end out.emit( oid, &e ) end diff --git a/lib/yaml/rubytypes.rb b/lib/yaml/rubytypes.rb index eebf027135..dc6bb3359f 100644 --- a/lib/yaml/rubytypes.rb +++ b/lib/yaml/rubytypes.rb @@ -12,7 +12,7 @@ class Object def to_yaml_style; end def to_yaml_properties; instance_variables.sort; end def to_yaml( opts = {} ) - YAML::quick_emit( object_id, opts ) do |out| + YAML::quick_emit( self, opts ) do |out| out.map( taguri, to_yaml_style ) do |map| to_yaml_properties.each do |m| map.add( m[1..-1], instance_variable_get( m ) ) @@ -35,7 +35,7 @@ class Hash end end def to_yaml( opts = {} ) - YAML::quick_emit( object_id, opts ) do |out| + YAML::quick_emit( self, opts ) do |out| out.map( taguri, to_yaml_style ) do |map| each do |k, v| map.add( k, v ) @@ -83,7 +83,7 @@ class Struct end end def to_yaml( opts = {} ) - YAML::quick_emit( object_id, opts ) do |out| + YAML::quick_emit( self, opts ) do |out| # # Basic struct is passed as a YAML map # @@ -104,7 +104,7 @@ class Array yaml_as "tag:yaml.org,2002:seq" def yaml_initialize( tag, val ); concat( val.to_a ); end def to_yaml( opts = {} ) - YAML::quick_emit( object_id, opts ) do |out| + YAML::quick_emit( self, opts ) do |out| out.seq( taguri, to_yaml_style ) do |seq| each do |x| seq.add( x ) @@ -124,7 +124,7 @@ class Exception o end def to_yaml( opts = {} ) - YAML::quick_emit( object_id, opts ) do |out| + YAML::quick_emit( self, opts ) do |out| out.map( taguri, to_yaml_style ) do |map| map.add( 'message', message ) to_yaml_properties.each do |m| @@ -161,7 +161,7 @@ class String end end def to_yaml( opts = {} ) - YAML::quick_emit( is_complex_yaml? ? object_id : nil, opts ) do |out| + YAML::quick_emit( is_complex_yaml? ? self : nil, opts ) do |out| if is_binary_data? out.scalar( "tag:yaml.org,2002:binary", [self].pack("m"), :literal ) elsif to_yaml_properties.empty? @@ -227,7 +227,7 @@ class Range end end def to_yaml( opts = {} ) - YAML::quick_emit( object_id, opts ) do |out| + YAML::quick_emit( self, opts ) do |out| # if self.begin.is_complex_yaml? or self.begin.respond_to? :to_str or # self.end.is_complex_yaml? or self.end.respond_to? :to_str or # not to_yaml_properties.empty? @@ -310,7 +310,7 @@ class Time end end def to_yaml( opts = {} ) - YAML::quick_emit( object_id, opts ) do |out| + YAML::quick_emit( self, opts ) do |out| tz = "Z" # from the tidy Tobias Peters <t-peters@gmx.de> Thanks! unless self.utc? @@ -347,7 +347,7 @@ end class Date yaml_as "tag:yaml.org,2002:timestamp#ymd" def to_yaml( opts = {} ) - YAML::quick_emit( object_id, opts ) do |out| + YAML::quick_emit( self, opts ) do |out| out.scalar( "tag:yaml.org,2002:timestamp", self.to_s, :plain ) end end 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 ] ) diff --git a/test/yaml/test_yaml.rb b/test/yaml/test_yaml.rb index 676310e6fc..023a8b96f5 100644 --- a/test/yaml/test_yaml.rb +++ b/test/yaml/test_yaml.rb @@ -1272,6 +1272,14 @@ EOY assert_equal([{}], o.keys) end + # + # contributed by riley lynch [ruby-Bugs-8548] + # + def test_object_id_collision + omap = YAML::Omap.new + 1000.times { |i| omap["key_#{i}"] = { "value" => i } } + raise "id collision in ordered map" if omap.to_yaml =~ /id\d+/ + end end if $0 == __FILE__ @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 195 +#define RUBY_PATCHLEVEL 196 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |