nobu	2009-02-15 21:07:07 +0900 (Sun, 15 Feb 2009)

  New Revision: 22329

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22329

  Log:
    * 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/ChangeLog
    branches/ruby_1_8/lib/ostruct.rb
    branches/ruby_1_8/test/ostruct/test_ostruct.rb

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 22328)
+++ ruby_1_8/ChangeLog	(revision 22329)
@@ -1,3 +1,11 @@
+Sun Feb 15 21:07:05 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].
+
 Sat Feb 14 18:57:10 2009  Tanaka Akira  <akr@f...>
 
 	* eval.c (rb_thread_schedule): handle EBADF of select as well.
Index: ruby_1_8/lib/ostruct.rb
===================================================================
--- ruby_1_8/lib/ostruct.rb	(revision 22328)
+++ ruby_1_8/lib/ostruct.rb	(revision 22329)
@@ -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/test/ostruct/test_ostruct.rb
===================================================================
--- ruby_1_8/test/ostruct/test_ostruct.rb	(revision 22328)
+++ ruby_1_8/test/ostruct/test_ostruct.rb	(revision 22329)
@@ -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/