ruby-changes:11916
From: shyouhei <ko1@a...>
Date: Tue, 26 May 2009 21:00:57 +0900 (JST)
Subject: [ruby-changes:11916] Ruby:r23579 (ruby_1_8_7): merge revision(s) 22329:
shyouhei 2009-05-26 21:00:44 +0900 (Tue, 26 May 2009) New Revision: 23579 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23579 Log: merge revision(s) 22329: * lib/ostruct.rb (OpenStruct#inspect): fixed the recursion check. Patch by Kornelius Kalnbach. [ruby-core:20992]. * test/ostruct/test_ostruct.rb: test for inspect. Patch by Kornelius Kalnbach. [ruby-core:20992]. Modified files: branches/ruby_1_8_7/ChangeLog branches/ruby_1_8_7/lib/ostruct.rb branches/ruby_1_8_7/test/ostruct/test_ostruct.rb branches/ruby_1_8_7/version.h Index: ruby_1_8_7/ChangeLog =================================================================== --- ruby_1_8_7/ChangeLog (revision 23578) +++ ruby_1_8_7/ChangeLog (revision 23579) @@ -1,3 +1,11 @@ +Tue May 26 21:00:08 2009 Nobuyoshi Nakada <nobu@r...> + + * lib/ostruct.rb (OpenStruct#inspect): fixed the recursion check. + Patch by Kornelius Kalnbach. [ruby-core:20992]. + + * test/ostruct/test_ostruct.rb: test for inspect. + Patch by Kornelius Kalnbach. [ruby-core:20992]. + Tue May 26 20:50:32 2009 Tanaka Akira <akr@f...> * eval.c (rb_thread_schedule): handle EBADF of select as well. Index: ruby_1_8_7/version.h =================================================================== --- ruby_1_8_7/version.h (revision 23578) +++ ruby_1_8_7/version.h (revision 23579) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-05-26" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20090526 -#define RUBY_PATCHLEVEL 161 +#define RUBY_PATCHLEVEL 162 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 Index: ruby_1_8_7/lib/ostruct.rb =================================================================== --- ruby_1_8_7/lib/ostruct.rb (revision 23578) +++ ruby_1_8_7/lib/ostruct.rb (revision 23579) @@ -111,25 +111,23 @@ def inspect str = "#<#{self.class}" - Thread.current[InspectKey] ||= [] - if Thread.current[InspectKey].include?(self) then - str << " ..." - else + ids = (Thread.current[InspectKey] ||= []) + if ids.include?(object_id) + return str << ' ...>' + end + + ids << object_id + begin first = true for k,v in @table str << "," unless first first = false - - Thread.current[InspectKey] << v - begin - str << " #{k}=#{v.inspect}" - ensure - Thread.current[InspectKey].pop - end + str << " #{k}=#{v.inspect}" end + return str << '>' + ensure + ids.pop end - - str << ">" end alias :to_s :inspect Index: ruby_1_8_7/test/ostruct/test_ostruct.rb =================================================================== --- ruby_1_8_7/test/ostruct/test_ostruct.rb (revision 23578) +++ ruby_1_8_7/test/ostruct/test_ostruct.rb (revision 23579) @@ -20,4 +20,18 @@ o2.instance_eval{@table = {:a => 'b'}} assert_not_equal(o1, o2) end + + def test_inspect + foo = OpenStruct.new + assert_equal("#<OpenStruct>", foo.inspect) + foo.bar = 1 + foo.baz = 2 + assert_equal("#<OpenStruct bar=1, baz=2>", foo.inspect) + + foo = OpenStruct.new + foo.bar = OpenStruct.new + assert_equal('#<OpenStruct bar=#<OpenStruct>>', foo.inspect) + foo.bar.foo = foo + assert_equal('#<OpenStruct bar=#<OpenStruct foo=#<OpenStruct ...>>>', foo.inspect) + end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/