diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/pp.rb | 18 | ||||
| -rw-r--r-- | test/test_pp.rb | 13 |
3 files changed, 34 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Sep 27 13:06:43 2009 Tanaka Akira <akr@fsij.org> + + * lib/pp.rb (PP:ObjectMixin#pretty_print): delegates has no inspect + method. [ruby-core:25804] + Sun Sep 27 12:01:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (str_buf_cat2): optimize since all second arguments are @@ -283,9 +283,23 @@ class PP < PrettyPrint # This module provides predefined #pretty_print methods for some of # the most commonly used built-in classes for convenience. def pretty_print(q) - if /\(Kernel\)#/ !~ Object.instance_method(:method).bind(self).call(:inspect).inspect + method_method = Object.instance_method(:method).bind(self) + begin + inspect_method = method_method.call(:inspect) + rescue NameError + end + begin + to_s_method = method_method.call(:to_s) + rescue NameError + end + if inspect_method && /\(Kernel\)#/ !~ inspect_method.inspect + q.text self.inspect + elsif !inspect_method && self.respond_to?(:inspect) q.text self.inspect - elsif /\(Kernel\)#/ !~ Object.instance_method(:method).bind(self).call(:to_s).inspect && instance_variables.empty? + elsif to_s_method && /\(Kernel\)#/ !~ to_s_method.inspect && + instance_variables.empty? + q.text self.to_s + elsif !to_s_method && self.respond_to?(:to_s) q.text self.to_s else q.pp_object(self) diff --git a/test/test_pp.rb b/test/test_pp.rb index 1809770049..604cbc509e 100644 --- a/test/test_pp.rb +++ b/test/test_pp.rb @@ -1,6 +1,9 @@ require 'pp' +require 'delegate' require 'test/unit' +module PPTestModule + class PPTest < Test::Unit::TestCase def test_list0123_12 assert_equal("[0, 1, 2, 3]\n", PP.pp([0,1,2,3], '', 12)) @@ -178,3 +181,13 @@ class PPSingleLineTest < Test::Unit::TestCase assert_equal("[1#{', 1'*99}]", PP.singleline_pp([1]*100, '')) end end + +class PPDelegateTest < Test::Unit::TestCase + class A < DelegateClass(Array); end + + def test_delegate + assert_equal("[]\n", A.new([]).pretty_inspect, "[ruby-core:25804]") + end +end + +end |