From d0ea0b4a8dd44a90bdd3cd83ac94fe1ba4aea440 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 20 Jan 2003 19:17:15 +0000 Subject: [PATCH] refine previous change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 ++++--- lib/pp.rb | 21 --------------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c43e17c9b..e64ec0c33a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,8 @@ -Tue Jan 21 02:55:10 2003 Tanaka Akira +Tue Jan 21 04:15:50 2003 Tanaka Akira - * lib/pp.rb: Don't redefine `inspect'. - (pretty_print_inspect): new method. + * lib/pp.rb: Use redefined `to_s' as well as `inspect'. + Useless `pretty_print' methods removed. + (PP::ObjectMixin#pretty_print_inspect): new method. Mon Jan 20 21:48:43 2003 Akinori MUSHA diff --git a/lib/pp.rb b/lib/pp.rb index 0ff1456285..7456ba12c3 100644 --- a/lib/pp.rb +++ b/lib/pp.rb @@ -242,7 +242,6 @@ class PP < PrettyPrint # 3. generic pretty_print def pretty_print(pp) - # specific pretty_print is not defined, try specific inspect. if /\(Kernel\)#/ !~ method(:inspect).inspect || /\(Kernel\)#/ !~ method(:to_s).inspect pp.text inspect @@ -271,14 +270,6 @@ class PP < PrettyPrint end end -[Numeric, FalseClass, TrueClass, Module].each {|c| - c.class_eval { - def pretty_print(pp) - pp.text self.to_s - end - } -} - class Array def pretty_print(pp) pp.group(1, '[', ']') { @@ -419,22 +410,10 @@ class File end end -class << ARGF - def pretty_print(pp) - pp.text self.to_s - end -end - class Object include PP::ObjectMixin end -[Numeric, Symbol, FalseClass, TrueClass, NilClass, Module].each {|c| - c.class_eval { - alias :pretty_print_cycle :pretty_print - } -} - if __FILE__ == $0 require 'runit/testcase' require 'runit/cui/testrunner'