diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/pp.rb | 18 |
2 files changed, 22 insertions, 3 deletions
@@ -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 19:57:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * util.c (ruby_strtod): differ addition to minimize error. @@ -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. @@ -315,8 +321,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 '=' @@ -329,7 +335,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 @@ -468,6 +474,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 |