ruby-changes:2449
From: ko1@a...
Date: 16 Nov 2007 02:54:46 +0900
Subject: [ruby-changes:2449] why - Ruby:r13940 (trunk): * lib/yaml.rb (quick_emit): use combination of object_id and hash to
why 2007-11-16 02:54:32 +0900 (Fri, 16 Nov 2007) New Revision: 13940 Modified files: trunk/ChangeLog trunk/lib/yaml/rubytypes.rb trunk/lib/yaml.rb trunk/test/yaml/test_yaml.rb Log: * 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] http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13940&r2=13939 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/yaml/test_yaml.rb?r1=13940&r2=13939 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/yaml/rubytypes.rb?r1=13940&r2=13939 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/yaml.rb?r1=13940&r2=13939 Index: ChangeLog =================================================================== --- ChangeLog (revision 13939) +++ ChangeLog (revision 13940) @@ -1,3 +1,9 @@ +Fri Nov 16 02:51:59 2007 why the lucky stiff <why@r...> + + * 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] + Thu Nov 15 19:49:03 2007 NAKAMURA Usaku <usa@r...> * ext/curses/extconf.rb: check macro if cannot find func. Index: lib/yaml.rb =================================================================== --- lib/yaml.rb (revision 13939) +++ lib/yaml.rb (revision 13940) @@ -384,6 +384,10 @@ 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 Index: lib/yaml/rubytypes.rb =================================================================== --- lib/yaml/rubytypes.rb (revision 13939) +++ lib/yaml/rubytypes.rb (revision 13940) @@ -12,7 +12,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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@g...> Thanks! unless self.utc? @@ -347,7 +347,7 @@ 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 Index: test/yaml/test_yaml.rb =================================================================== --- test/yaml/test_yaml.rb (revision 13939) +++ test/yaml/test_yaml.rb (revision 13940) @@ -1272,6 +1272,14 @@ 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__ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml