From 95079dbe784b785a02e91147c2183431ef6ada51 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 13 May 2006 07:35:50 +0000
Subject: * lib/pp.rb (PP.mcall): new method.   (Struct#pretty_print): call
 Kernel#class and Struct#members even if   overriden.  
 (Struct#pretty_print_cycle): ditto.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  7 +++++++
 lib/pp.rb | 18 +++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f4fc8080..c99a2195f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat May 13 16:14:05 2006  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb (PP.mcall): new method.
+	  (Struct#pretty_print): call Kernel#class and Struct#members even if
+	  overriden.
+	  (Struct#pretty_print_cycle): ditto.
+
 Thu May 11 18:30:11 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_cipher.c (add_cipher_name_to_ary): should return
diff --git a/lib/pp.rb b/lib/pp.rb
index 62c98bd45..dc5856dab 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -83,6 +83,12 @@ class PP < PrettyPrint
     out
   end
 
+  # :stopdoc:
+  def PP.mcall(obj, mod, meth, *args, &block)
+    mod.instance_method(meth).bind(obj).call(*args, &block)
+  end
+  # :startdoc:
+
   @sharing_detection = false
   class << self
     # Returns the sharing detection flag as a boolean value.
@@ -343,8 +349,8 @@ end
 
 class Struct
   def pretty_print(q)
-    q.group(1, '#<struct ' + self.class.name, '>') {
-      q.seplist(self.members, lambda { q.text "," }) {|member|
+    q.group(1, '#<struct ' + PP.mcall(self, Kernel, :class).name, '>') {
+      q.seplist(PP.mcall(self, Struct, :members), lambda { q.text "," }) {|member|
         q.breakable
         q.text member.to_s
         q.text '='
@@ -357,7 +363,7 @@ class Struct
   end
 
   def pretty_print_cycle(q)
-    q.text sprintf("#<struct %s:...>", self.class.name)
+    q.text sprintf("#<struct %s:...>", PP.mcall(self, Kernel, :class).name)
   end
 end
 
@@ -496,6 +502,12 @@ if __FILE__ == $0
     def test_list0123_11
       assert_equal("[0,\n 1,\n 2,\n 3]\n", PP.pp([0,1,2,3], '', 11))
     end
+
+    OverriddenStruct = Struct.new("OverriddenStruct", :members, :class)
+    def test_struct_override_members # [ruby-core:7865]
+      a = OverriddenStruct.new(1,2)
+      assert_equal("#<struct Struct::OverriddenStruct members=1, class=2>\n", PP.pp(a, ''))
+    end
   end
 
   class HasInspect
-- 
cgit